socialcastr 0.2.4 → 0.2.5

data/lib/socialcastr/base.rb

@@ -67,7 +67,7 @@ module Socialcastr
 
     def method_missing(method, *args, &block)
       if method.to_s =~ /=$/
-        @data[method_name(method.to_s.sub(/=$/,''))] = *args
+        @data[method_name(method.to_s.sub(/=$/,''))] = args.first
       else
         return @data[method_name(method)] unless @data[method_name(method)].nil?
       end

data/lib/socialcastr/message.rb

@@ -35,9 +35,7 @@ module Socialcastr
     
 
     def self.search(query, arguments={})
-      puts "searching for #{query}"
       xml = api.get(collection_path + "/search", { :q => query}.merge(arguments))
-      puts "Got a response xml of #{xml.length} bytes"
       return parse(xml)
     end
   end

data/lib/socialcastr/sax/active_resource.rb

@@ -1,10 +1,3 @@
-class Boolean
-  def initialize(string)
-    return true if string == "true"
-    return false
-  end
-end
-
 class String
   def contains_dot?
      self =~ /\./
@@ -26,6 +19,11 @@ module Socialcastr
 
     class ActiveResource < Nokogiri::XML::SAX::Document
       attr_accessor :data
+      HASH    = "hash"
+      ARRAY   = "array"
+      INTEGER = "integer"
+      BOOLEAN = "boolean"
+      STRING  = "string"
 
       def initialize
         @types = []
@@ -37,20 +35,60 @@ module Socialcastr
         characters(s)
       end
 
+      def start_element name, attrs = []
+        return nil_element! if name.contains_dot? # [FIXME] we can't evaluate strings inside elements like <html.title>
+        type = parse_attrs_and_get_type(attrs)
+        return if nil_element?
+        push_element(type)
+      end
+
+      def characters string
+        return if nil_element? || (string.all_spaces? && (container_type != STRING || container_value.nil?))
+        update_string_element(string)
+      end
+
+      def end_element name
+        return end_nil_element if nil_element?
+
+        (value, type) = pop_element
+        case type
+        when HASH
+          element = element_class(name).from_hash(value || {})
+        when INTEGER
+          element = value.to_i
+        when BOOLEAN
+          element = value == "true" ? true : false
+        when ARRAY
+          element = value || []
+        else
+          element = value
+        end
+
+        if container_type
+          add_to_container(name, element)
+        else # Root Node
+          self.data = element
+        end
+      end
+
+      private
+
+      def element_class(name)
+        if RUBY_VERSION < '1.9' 
+          Socialcastr.const_get(Socialcastr.to_class_name(name))
+        else 
+          Socialcastr.const_get(Socialcastr.to_class_name(name), false)
+        end
+      end
+
       def container_type
-        @types[-1]
+        @types.last
       end
 
       def container_value
-        @values[-1]
+        @values.last
       end
 
-      HASH = 104      # 'h'
-      ARRAY = 97      # 'a'
-      INTEGER = 105   # 'i'
-      BOOLEAN = 98    # 'b'
-      STRING = 115    # 's'
-
       def nil_element!
         @nil = true 
       end
@@ -66,7 +104,7 @@ module Socialcastr
       def parse_attrs_and_get_type(attribute_array=[])
         attributes = attribute_array.to_hash
         return nil_element! if attributes["nil"]
-        attributes["type"] ? attributes["type"][0] : HASH
+        attributes["type"] ? attributes["type"] : HASH
       end
 
       def push_element(type)
@@ -91,41 +129,6 @@ module Socialcastr
         end
       end
 
-      def start_element name, attrs = []
-        return nil_element! if name.contains_dot? # [FIXME] we can't evaluate strings inside elements like <html.title>
-        type = parse_attrs_and_get_type(attrs)
-        return if nil_element?
-        push_element(type)
-      end
-
-      def characters string
-        return if nil_element? || (string.all_spaces? && (container_type != STRING || container_value.nil?))
-        update_string_element(string)
-      end
-
-      def end_element name
-        return end_nil_element if nil_element?
-
-        (value, type) = pop_element
-        case type
-        when HASH
-          element = Socialcastr.const_get(Socialcastr.to_class_name(name), false).from_hash(value || {})
-        when INTEGER
-          element = value.to_i
-        when BOOLEAN
-          element = Boolean.new(value)
-        when ARRAY
-          element = value || []
-        else
-          element = value
-        end
-
-        if container_type
-          add_to_container(name, element)
-        else # Root Node
-          self.data = element
-        end
-      end
     end
   end
 end

data/lib/socialcastr/version.rb

@@ -1,3 +1,3 @@
 module Socialcastr
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/socialcastr.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.5')
   s.add_development_dependency('yard')
   s.add_development_dependency('artifice')
-  s.add_runtime_dependency('nokogiri', '1.4.4')
+  s.add_runtime_dependency('nokogiri', '>= 1.4.4')
   s.authors = ["Riccardo Cambiassi"]
   s.description = %q{A Ruby wrapper for the Socialcast REST API}
   s.post_install_message =<<eos

data/spec/api_spec.rb

@@ -142,7 +142,7 @@ describe Socialcastr::API do
       @https.class.should == Net::HTTP
     end
     it "should use ssl" do
-      @https.use_ssl.should be_true
+      @https.use_ssl?.should be_true
     end
     it "should not verify SSL" do
       @https.verify_mode.should == OpenSSL::SSL::VERIFY_NONE

data/spec/base_spec.rb

@@ -117,7 +117,7 @@ describe Socialcastr::Base do
 
     context 'after modifying one attribute' do
       before :each do
-        @message.title = 'new title'
+        @message.title = "new title"
       end
 
       it 'the attribute should be changed' do
@@ -162,7 +162,7 @@ describe Socialcastr::Base do
 
   context 'last or find(:last)' do
     before :each do
-      fake_socialcast_api_for(:message) do
+      fake_socialcast_api_for(:messages) do
         @message = Socialcastr::Message.last
       end
     end

data/spec/message_spec.rb

@@ -152,7 +152,6 @@ describe Socialcastr::Message do
 
     it "should return a message" do
       @messages = Socialcastr::Message.search("trying")
-      puts "@messages is a #{@message.class}"
       @messages.size.should == 20
     end
   end

data/spec/sax/active_resource_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe Socialcastr::SAX::ActiveResource do
+  describe "#parse" do
+    before do
+      @active_resource = Socialcastr::SAX::ActiveResource.new
+      @parser = Nokogiri::XML::SAX::Parser.new(@active_resource)
+    end
+
+    context "an empty document with a root 'message' element" do
+      it "should return a Message object" do
+        xml = "<message></message>"
+        @parser.parse(xml)
+        @active_resource.data.class.should == Socialcastr::Message
+      end
+    end
+    context "a document with a nil element" do
+      it "should make the nil element accessible" do
+        xml = "<message><rating nil=\"true\"></rating></message>"
+        @parser.parse(xml)
+        @active_resource.data.rating.should be_nil
+      end
+    end
+
+    context "a document with a string element" do
+      it "should make the element accessible as a string" do
+        xml = "<message><title>Hello World!</title></message>"
+        @parser.parse(xml)
+        @active_resource.data.title.class.should == String
+        @active_resource.data.title.should == "Hello World!"
+      end
+    end
+
+    context "a document with a true boolean element" do
+      it "should make the element accessible as a boolean" do
+        xml = "<message><ratable type=\"boolean\">true</ratable></message>"
+        @parser.parse(xml)
+        @active_resource.data.ratable.should be_true
+      end
+    end
+
+    context "a document with a false boolean element" do
+      it "should make the element accessible as a boolean" do
+        xml = "<message><ratable type=\"boolean\">false</ratable></message>"
+        @parser.parse(xml)
+        @active_resource.data.ratable.should be_false
+      end
+    end
+
+    context "a document with an array of 2 string elements" do
+      before do
+        xml = "<message><tags type=\"array\"><tag>first</tag><tag>second</tag></tags></message>"
+        @parser.parse(xml)
+      end
+      it "should make the array accessible through the collection name" do
+        @active_resource.data.tags.class.should == Array
+      end
+      it "should have an array containing 2 elements" do
+        @active_resource.data.tags.size.should == 2
+      end
+      it "should have an array of objects of class string" do
+        @active_resource.data.tags.first.class.should == String
+      end
+    end
+
+    context "a document with an array of 2 complex elements" do
+      before do 
+        xml = "<message><tags type=\"array\"><tag><name>first</name></tag><tag><name>second</name></tag></tags></message>"
+        @parser.parse(xml)
+      end
+      it "should make the array accessible through the c ollection name" do
+        @active_resource.data.tags.class.should == Array
+      end
+      it "should have an array containing 2 elements" do
+        @active_resource.data.tags.size.should == 2
+      end
+      it "should have an array of objects of class derived from the element name" do
+        @active_resource.data.tags.first.class.should == Socialcastr::Tag
+      end
+    end
+
+    context "a document with an array as the root element" do
+      before do
+        xml = "<messages type=\"array\"><msg>hello</msg><msg>world</msg></messages>"
+        @parser.parse(xml)
+      end
+      it "should return an array" do
+        @active_resource.data.class.should == Array
+      end
+      it "should grant access to each element" do
+        @active_resource.data.first.should == "hello"
+      end
+    end
+
+    context "a document with a complex element" do
+      before do 
+        xml = "<message><user><username>johndoe</username><name>John Doe</name></user></message>"
+        @parser.parse(xml)
+      end
+      it "should grant access to the inside element as an object of class derived from the element name" do
+        @active_resource.data.user.class.should == Socialcastr::User
+      end
+      it "should grant access to nested elements as methods of the parent class" do
+        @active_resource.data.user.username.should == "johndoe"
+      end
+    end
+  end 
+end

metadata

@@ -1,106 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: socialcastr
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Riccardo Cambiassi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-19 00:00:00.000000000 +01:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153287440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153287440
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153315340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153315340
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153314960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: artifice
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153314960
+- !ruby/object:Gem::Dependency
+  name: artifice
+  requirement: &2153314500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153314500
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2153314000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *2153314000
 description: A Ruby wrapper for the Socialcast REST API
-email: 
+email:
 - bru@codewitch.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.markdown
@@ -129,53 +102,37 @@ files:
 - spec/fixtures/message.xml
 - spec/fixtures/messages.xml
 - spec/message_spec.rb
+- spec/sax/active_resource_spec.rb
 - spec/socialcastr_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/bru/socialcastr
 licenses: []
-
-post_install_message: |
-  ********************************************************************************
-  
-    Thank you for installing socialcastr
-  
-    Follow @bru on Twitter for announcements, updates, and news.
-    https://twitter.com/bru
-  
-  ********************************************************************************
-
+post_install_message: ! "********************************************************************************\n\n
+  \ Thank you for installing socialcastr\n\n  Follow @bru on Twitter for announcements,
+  updates, and news.\n  https://twitter.com/bru\n\n********************************************************************************\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: socialcastr
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Socialcast API
-test_files: 
+test_files:
 - spec/api_spec.rb
 - spec/base_spec.rb
 - spec/comment_spec.rb
@@ -184,5 +141,6 @@ test_files:
 - spec/fixtures/message.xml
 - spec/fixtures/messages.xml
 - spec/message_spec.rb
+- spec/sax/active_resource_spec.rb
 - spec/socialcastr_spec.rb
 - spec/spec_helper.rb