socialcastr 0.2.3 → 0.2.4

data/lib/socialcastr/base.rb

@@ -94,8 +94,9 @@ module Socialcastr
       end
 
       def find(*arguments)
-        scope = arguments.slice!(0)
-        options = arguments.slice!(0) || {}
+        args = arguments.dup
+        scope = args.slice!(0)
+        options = args.slice!(0) || {}
         case scope
           when :all   then find_every(options)
           when :first then find_every(options).first

data/lib/socialcastr/sax/active_resource.rb

@@ -15,6 +15,12 @@ class String
   end
 end
 
+class Array
+  def to_hash
+    self.reduce({}) { |h,kv| h[kv[0]] = kv[1]; h }
+  end
+end
+
 module Socialcastr
   module SAX
 
@@ -31,83 +37,93 @@ module Socialcastr
         characters(s)
       end
 
+      def container_type
+        @types[-1]
+      end
+
+      def container_value
+        @values[-1]
+      end
+
       HASH = 104      # 'h'
       ARRAY = 97      # 'a'
       INTEGER = 105   # 'i'
       BOOLEAN = 98    # 'b'
       STRING = 115    # 's'
 
-      def container_type
-        @types[-1]
+      def nil_element!
+        @nil = true 
       end
 
-      def container_value
-        @values[-1]
+      def nil_element?
+        @nil
+      end
+
+      def end_nil_element
+        @nil = false
       end
 
-      def parse_attrs_and_get_type(attrs=[])
-        type = HASH
-        attrs.each do |attr|
-          case attr[0]
-          when "type"
-            type = attr[1][0]
-          when "nil"
-            @nil = true
-          end
+      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
+      end
+
+      def push_element(type)
+        @types.push type
+        @values.push nil
+      end
+
+      def pop_element
+        return [@values.pop, @types.pop]
+      end
+
+      def update_string_element(string)
+        @types[-1]  = STRING if container_type == HASH
+        @values[-1] = container_value ? container_value + string : string 
+      end
+
+      def add_to_container(name, element)
+        if container_type == ARRAY
+          container_value ? @values[-1].push(element) : @values[-1] = [element]
+        else # Hash
+          container_value ? @values[-1][name]=element : @values[-1] = { name => element }
         end
-        return type
       end
 
       def start_element name, attrs = []
-        if name.contains_dot? # [FIXME] we can't evaluate strings inside elements like <html.title>
-          @nil = true 
-          return nil
-        end
+        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)
-        unless @nil
-          @types.push type
-          @values.push nil
-        end
+        return if nil_element?
+        push_element(type)
       end
 
       def characters string
-        return if @nil 
-        return if (string.all_spaces? && (container_type != STRING || container_value.nil?))
-        @types[-1]  = STRING if container_type == HASH
-        @values[-1] = container_value ? container_value + string : string 
+        return if nil_element? || (string.all_spaces? && (container_type != STRING || container_value.nil?))
+        update_string_element(string)
       end
 
       def end_element name
-        if @nil
-          @nil = false
+        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
-          value = @values.pop
-          type = @types.pop
-
-          # return if value.nil?
-
-          case type
-          when HASH
-            element = Socialcastr.const_get(Socialcastr.to_class_name(name)).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
-            if container_type == ARRAY
-              @values[-1] ? @values[-1].push(element) : @values[-1] = [element]
-            else # Hash
-              @values[-1] ? @values[-1][name]=element : @values[-1] = { name => element }
-            end
-          else # Root Node
-            @data = element
-          end
+          element = value
+        end
+
+        if container_type
+          add_to_container(name, element)
+        else # Root Node
+          self.data = element
         end
       end
     end

data/lib/socialcastr/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcastr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Riccardo Cambiassi
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +01:00
-default_executable: 
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -132,7 +131,6 @@ files:
 - spec/message_spec.rb
 - spec/socialcastr_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/bru/socialcastr
 licenses: []
 
@@ -173,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: socialcastr
-rubygems_version: 1.5.3
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Socialcast API