action_kit_api 0.3.12 → 0.4.0

data/lib/action_kit_api/data_model.rb

@@ -18,29 +18,39 @@ module ActionKitApi
     end
     
     def save
-      if self.respond_to?('before_save')
-        self.send('before_save')
-      end
 
       class_name = self.class.to_s.split("::").last
 
       raise MissingRequiredAttributeException unless self.valid?
 
-      attrs_hash = self.to_hash
-      attrs_hash.delete_if do |k, v| 
-        @read_only_attrs.include?(k)
+      if self.id.nil?
+        if self.respond_to?('before_create')
+          self.send('before_create')
+        end
+        
+        call = "#{class_name}.create"
+        response = ActionKitApi.connection.call(call, self.safe_hash)
+        
+        if self.respond_to?('after_create')
+          self.send('after_create')
+        end
+      else
+        if self.respond_to?('before_save')
+          self.send('before_save')
+        end
+        
+        call = "#{class_name}.save_or_create"
+        response = ActionKitApi.connection.call(call, self.safe_hash)
+        
+        if self.respond_to?('after_save')
+          self.send('after_save')
+        end
       end
 
-      call = "#{class_name}.save_or_create"
-
-      response = ActionKitApi.connection.call(call, attrs_hash)
 
       # Update ourselves to include the data that the server populated 
       self.update(response)
       
-      if self.respond_to?('after_save')
-        self.send('after_save')
-      end
 
       self
     end
@@ -50,10 +60,6 @@ module ActionKitApi
     # keys in the hash that is passed, and will not update/add non-existant
     # attributes
     def update(hash = {})
-      if self.respond_to?('before_update')
-        self.send('before_update')
-      end
-
       hash.each do |k,v|
         # The name of the setter for the value of k
         setter = "#{k}="
@@ -65,10 +71,6 @@ module ActionKitApi
         end
       end
 
-      if self.respond_to?('after_update')
-        self.send('after_update')
-      end
-
       self
     end
 
@@ -98,6 +100,15 @@ module ActionKitApi
 
       user_hash
     end
+
+    def safe_hash
+      attrs_hash = self.to_hash
+      attrs_hash.delete_if do |k, v| 
+        @read_only_attrs.include?(k)
+      end
+
+      attrs_hash
+    end
   end 
 end
 

data/lib/action_kit_api/event.rb

@@ -18,7 +18,7 @@ module ActionKitApi
 
     def initialize(*args)
       @required_attrs = [:campaign_id, :creator_id]
-      @read_only_attrs = [:attendee_count]
+      @read_only_attrs = [:attendee_count, :host_is_confirmed, :is_full, :is_in_past, :is_open_for_signup, :status_summary]
 
       super
     end

data/lib/action_kit_api/event_campaign.rb

@@ -26,49 +26,13 @@ module ActionKitApi
       @show_address1 ||= true
     end
 
-    # After creating a new event campaign we need to create the
-    # associated signup and hosting pages. These will follow the
-    # ActionKit convention to prevent them from getting wise. This
-    # is so we don't have to use that sketchy part of their API
-    def after_save
-      # Only continue if we have a valid id
-      if self.id.nil?
-        return
-      end
-
-      signup_page_name = "#{self.name}_signup"
-      create_page_name = "#{self.name}_create"
-
-      # These two calls trigger an exception EVEN IF THEY SUCCEED, since there
-      # won't be any events for them yet :-/
-      begin
-        if ActionKitApi::Page.find_by_name(signup_page_name).nil?
-          signup_page = ActionKitApi::EventSignupPage.new(:name => signup_page_name, :title => "{self.title} - Attend", :campaign_id => self.id)
-          signup_page.save
-        end
-      rescue
-      end
-      
-      begin
-        if ActionKitApi::Page.find_by_name(create_page_name).nil?
-          create_page = ActionKitApi::EventCreatePage.new(:name => create_page_name, :title => "{self.title} - Host", :campaign_id => self.id)
-          create_page.save
-        end
-      rescue
-      end
-    end
-
+    # Requires at a minimum the creator_id
     def create_event(*args)
       raise "EventCampaign needs to be saved before Event creation" if self.id.nil?
 
-      (args[0]).merge(:campaign_id => self.id)
+      (args[0]).merge!(:campaign_id => self.id)
 
       event = ActionKitApi::Event.new(*args)
-      event.save
-
-      result = ActionKitApi.connection.call("EventCreate.create", {:event_id => event.id})
-
-      event
     end
 
     # Uses public_search so is subject those limitations

data/lib/action_kit_api/version.rb

@@ -1,3 +1,3 @@
 module ActionKitApi
-  VERSION = "0.3.12"
+  VERSION = "0.4.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 12
-  version: 0.3.12
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sam Stelfox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-14 00:00:00 -04:00
+date: 2012-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency