socialcastr 0.2.9 → 0.2.10

data/lib/socialcastr/base.rb

@@ -2,11 +2,13 @@ require 'nokogiri'
 require 'socialcastr/sax/active_resource'
 module Socialcastr
   class Base 
-    def initialize(arguments={})
+    attr_accessor :prefix_options
+    def initialize(arguments={}, prefix_options={})
       @data = {}
-      arguments.map do |k,v|
+      arguments.each_pair do |k,v|
         @data[k.to_s] = v
       end
+      @prefix_options = prefix_options
     end
 
     def save
@@ -14,25 +16,32 @@ module Socialcastr
     end
 
     def create
-        api.post(collection_path, to_params).tap do |xml|
-          copy_attributes_from_object(self.class.parse(xml))
-        end
+      api.post(collection_path, to_params).tap do |xml|
+        copy_attributes_from_object(self.class.parse(xml))
+      end
     end
 
     def update
-        api.put(element_path, to_params).tap do |xml|
-          copy_attributes_from_object(self.class.parse(xml))
-        end
+      api.put(element_path, to_params).tap do |xml|
+        copy_attributes_from_object(self.class.parse(xml))
+      end
     end
 
     def refresh
-        api.get(element_path).tap do |xml|
-          copy_attributes_from_object(self.class.parse(xml))
-        end
+      api.get(element_path).tap do |xml|
+        copy_attributes_from_object(self.class.parse(xml))
+      end
+      return self
+    end
+
+    def destroy
+      api.delete(element_path)
+      return self
     end
     
     def copy_attributes_from_object(object=nil)
       @data = object.instance_variable_get("@data")
+      return self
     end
 
     def new?
@@ -43,12 +52,12 @@ module Socialcastr
       self.class.api
     end
 
-    def element_path(prefix_options={})
-      self.class.element_path(self.id, prefix_options)
+    def element_path
+      self.class.element_path(self.id, @prefix_options)
     end
 
-    def collection_path(options={})
-      self.class.collection_path(options)
+    def collection_path
+      self.class.collection_path(@prefix_options)
     end
 
     def to_params
@@ -59,6 +68,10 @@ module Socialcastr
       params
     end
 
+    def to_prefix_options
+      @prefix_options.merge "#{self.class.model_name.downcase}_id" => id
+    end
+
     def param_name(variable_name)
       "#{self.class.model_name.downcase}[#{variable_name}]"
     end
@@ -77,41 +90,29 @@ module Socialcastr
       else
         obj = @data[method_name(method)] 
         unless new?
-          if obj.class.ancestors.include? Socialcastr::Base
-            obj.add_container_id(self)
-          end
-          if obj.class == Array
-            obj.each do |o|
-              o.add_container_id(self)
-            end
-          end
+          self.class.set_prefix_options(obj, to_prefix_options)
         end
         return obj
       end
     end
 
-    def add_container_id(container)
-      self.send("#{container.class.model_name.downcase}_id=", container.id)
-    end
-
     class << self
-      def parse(xml="")
-        source = SAX::ActiveResource.new
-        Nokogiri::XML::SAX::Parser.new(source).parse(xml)
-        case source.data
-        when Hash
-          return from_hash(source.data)
-        else
-          return source.data
-        end
+      def parse(xml="", prefix_options={})
+        resource = SAX::ActiveResource.new
+        Nokogiri::XML::SAX::Parser.new(resource).parse(xml)
+        return set_prefix_options(resource.data, prefix_options)
       end
 
-      def parse_and_prefix(xml, prefix_options)
-        obj = parse(xml)
-        prefix_options.each_pair do |k,v|
-          obj.send("#{k}=", v)
+      def set_prefix_options(obj, prefix_options={})
+        if obj.class.ancestors.include? Socialcastr::Base
+          obj.prefix_options = prefix_options
+          return obj
+        end
+        if obj.class == Array
+          obj.each do |o|
+            set_prefix_options(o, prefix_options)
+          end
         end
-        return obj
       end
 
       def from_hash(h)
@@ -137,13 +138,13 @@ module Socialcastr
       def find_single(id, options)
         (prefix_options, query_options) = parse_options(options)
         path = element_path(id, prefix_options)
-        parse_and_prefix(api.get(path, query_options), prefix_options)
+        parse(api.get(path, query_options), prefix_options)
       end
 
       def find_every(options)
         (prefix_options, query_options) = parse_options(options)
         path = collection_path(prefix_options)
-        parse_and_prefix(api.get(path, query_options), prefix_options)
+        parse(api.get(path, query_options), prefix_options)
       end
 
       def all(*arguments)

data/lib/socialcastr/comment.rb

@@ -1,13 +1,13 @@
 module Socialcastr
   class Comment < Base
     def like!
-      api.post(element_path(:message_id => message_id) + "/likes")
+      Socialcastr::Like.new({}, to_prefix_options).save
       refresh
       return self
     end
 
     def unlike!
-      api.delete(element_path(:message_id => message_id) + "/likes/#{like_id}")
+      like.destroy
       refresh
       return self
     end
@@ -20,8 +20,8 @@ module Socialcastr
       self.user.id  != api_id
     end
     
-    def like_id
-      self.likes.select { |like| like.unlikable_by?(api.profile.id) }.first.id
+    def like
+      self.likes.select { |like| like.unlikable_by?(api.profile.id) }.first
     end
   end
 end

data/lib/socialcastr/message.rb

@@ -4,7 +4,8 @@ module Socialcastr
 
     def flag!
       return true if flagged?
-      self.flag = Socialcastr::Flag.parse(api.post(element_path + "/flags"))
+      Socialcastr::Flag.new({}, :message_id => id).save
+      refresh
     end
 
     def flagged?
@@ -13,24 +14,24 @@ module Socialcastr
 
     def unflag!
       return unless flagged?
-      api.delete(element_path + "/flags/#{self.flag.id}")
-      self.flag = nil
+      self.flag.destroy
+      refresh  
     end
 
     def like!
-      self.likes ||= []
-      likes << Like.parse(api.post(element_path + "/likes"))
+      Socialcastr::Like.new({}, :message_id => id).save
+      refresh
     end
 
     def unlike!
       self.likes.reject! do |l|
-        l.unlikable && api.delete(element_path + "/likes/#{l.id}")
+        l.unlikable && l.destroy
       end
     end
 
     def comment!(arguments={})
-      comment = Socialcastr::Comment.new(arguments)
-      api.post(element_path + "/comments", comment.to_params)
+      Socialcastr::Comment.new(arguments, :message_id => id).save
+      refresh
     end
     
 

data/lib/socialcastr/version.rb

@@ -1,3 +1,3 @@
 module Socialcastr
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/message_spec.rb

@@ -67,24 +67,20 @@ describe Socialcastr::Message do
 
   context 'flagging a message' do
     before :each do
-      fake_socialcast_api_for(:message) do 
-        @message = Socialcastr::Message.find(425)
-      end
-      @api = mock(:api)
-      response = "<flag><id type='integer'>3333</id></flag>"
-      Socialcastr::Message.stub!(:api).and_return(@api)
-      @api.stub!(:post).and_return(response)
+      fake_socialcast_api_for(:message)
+      @message = Socialcastr::Message.find(425)
+      @flag = mock('flag', :save => true, :id => 1)
     end
 
     it "should assign an id to the Flag" do
+      Socialcastr::Flag.should_receive(:new).and_return(@flag)
       @message.flag!
-      @message.flag.id.should == 3333
     end
 
     context "unflagging the message" do
       before :each do
-        @message.flag!
-        @api.should_receive(:delete).with("/messages/425/flags/3333").and_return("")
+        @message.flag = @flag
+        @flag.should_receive(:destroy)
       end
 
       it "should not be flagged afterwards" do
@@ -101,41 +97,25 @@ describe Socialcastr::Message do
 
   context 'liking a message' do
     before :each do
-      fake_socialcast_api_for :message do 
-        @message = Socialcastr::Message.find(425)
-      end
+      fake_socialcast_api_for :message
+      @message = Socialcastr::Message.find(425)
 
-      @api = mock(:api)
-      response = "<like><id type='integer'>2222</id><unlikable>true</unlikable></like>"
-      Socialcastr::Message.stub!(:api).and_return(@api)
-      @api.stub!(:post).and_return(response)
+      @like = mock('like', :save => true)
     end
 
     it 'should create a new like' do
-      old_count = @message.likes.count
-      @message.like!
-      @message.likes.count.should == old_count + 1
-    end
-
-    it 'should assign an id the the new like' do
+      Socialcastr::Like.should_receive(:new).and_return(@like)
       @message.like!
-      @message.likes.last.id.should == 2222
     end
   end
 
   context "unliking a message" do
     before :each do 
-      fake_socialcast_api_for :message do
-        @message = Socialcastr::Message.find(425)
-      end
+      fake_socialcast_api_for :message
+      @message = Socialcastr::Message.find(425)
 
-      @api = mock(:api)
-      response = "<like><id>2222</id><unlikable>true</unlikable></like>"
-      Socialcastr::Message.stub!(:api).and_return(@api)
-      @api.stub!(:post).and_return(response)
-      @api.stub!(:delete).and_return("")
-      @message.like!
-      @message.likes.count.should == 1
+      @like = mock('like', :unlikable => true, :save => true, :destroy => true)
+      @message.stub!(:likes).and_return([@like])
     end
 
     it "should remove a like" do
@@ -158,16 +138,15 @@ describe Socialcastr::Message do
 
   context "commenting a message" do
     before :each do
-      fake_socialcast_api_for :message do
-        @message = Socialcastr::Message.find(425)
-      end
+      fake_socialcast_api_for :message
+      @message = Socialcastr::Message.find(425)
     end
 
     it "should post to messages/425/comments.xml" do
       @api = mock(:api)
       response = "<comment></comment>"
-      Socialcastr::Message.stub!(:api).and_return(@api)
-      @api.should_receive(:post).with("/messages/425/comments", {"comment[text]" => "hallo world"}).and_return(response)
+      Socialcastr::Comment.stub!(:api).and_return(@api)
+      @api.should_receive(:post).with("messages/425/comments", {"comment[text]" => "hallo world"}).and_return(response)
       @message.comment! :text => "hallo world"
     end
      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcastr
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000 +01:00
+date: 2011-07-24 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157634060 !ruby/object:Gem::Requirement
+  requirement: &2153369440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2157634060
+  version_requirements: *2153369440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157661960 !ruby/object:Gem::Requirement
+  requirement: &2153368940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2157661960
+  version_requirements: *2153368940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157661580 !ruby/object:Gem::Requirement
+  requirement: &2153368560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157661580
+  version_requirements: *2153368560
 - !ruby/object:Gem::Dependency
   name: artifice
-  requirement: &2157661120 !ruby/object:Gem::Requirement
+  requirement: &2153368100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157661120
+  version_requirements: *2153368100
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157660620 !ruby/object:Gem::Requirement
+  requirement: &2153367600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2157660620
+  version_requirements: *2153367600
 description: A Ruby wrapper for the Socialcast REST API
 email:
 - bru@codewitch.org