data_bindings 0.0.1 → 0.0.2

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 doc
 Gemfile.lock
 .DS_Store
+pkg

data/Gemfile

@@ -1,4 +1,3 @@
 source :rubygems
 
 gemspec
-gem 'hashie', :git => 'https://github.com/intridea/hashie.git'

data/data_bindings.gemspec

@@ -5,7 +5,7 @@ require "data_bindings/version"
 Gem::Specification.new do |s|
   s.name        = "data_bindings"
   s.version     = DataBindings::VERSION
-  s.authors     = ["Joshual Hull"]
+  s.authors     = ["Joshual Hull", "Benjamin Coe"]
   s.email       = ["joshbuddy@gmail.com"]
   s.homepage    = "http://github.com/joshbuddy/data_bindings"
   s.summary     = %q{Bind data to and from things}
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'hashie', '= 2.0.0.beta'
+  # s.add_runtime_dependency 'hashie', '= 2.0.0.beta' NOTE: re-add after this is really published
 
   # specify any dependencies here; for example:
   s.add_development_dependency 'bson'

data/lib/data_bindings.rb

@@ -1,4 +1,4 @@
-require 'hashie'
+require 'ext/hashie'
 
 require 'data_bindings/util'
 require 'data_bindings/generator'
@@ -24,7 +24,6 @@ module DataBindings
   class << self
     # Sends all methods calls to DefaultGenerator
     def method_missing(m, *args, &blk)
-      DefaultGeneratorInstance.send(:build!)
       DefaultGeneratorInstance.send(m, *args, &blk)
     end
 

data/lib/data_bindings/adapters/params.rb

@@ -11,14 +11,10 @@ module DataBindings
       
       
       def parse_nested_query(qs, d = nil)
-        params = {}
-        
-        (qs || '').split(d ? /[#{d}] */n : /[&;] */n).each do |p|
+        (qs || '').split(d ? /[#{d}] */n : /[&;] */n).inject({}) do |params, p|
           k, v = p.split('=', 2).map { |s| CGI::unescape(s) }
           normalize_params(params, k, v)
         end
-        
-        return params
       end
       
       private
@@ -26,9 +22,9 @@ module DataBindings
         name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
         k = $1 || ''
         after = $' || ''
-        
-        return if k.empty?
-        
+
+        return params if k.empty?
+
         if after == ""
           params[k] = v
         elsif after == "[]"

data/lib/data_bindings/generator.rb

@@ -44,7 +44,7 @@ module DataBindings
     # @yield [*Object] All arguments passed to the method used to invoke this reader
     def reader(name, &blk)
       @reader_module.define_singleton_method(name, &blk)
-      @build = false
+      build!
     end
 
     # Defines a writer
@@ -73,7 +73,7 @@ module DataBindings
     # @param [Object] The adapter
     def register(name, cls)
       @adapters[name] = cls
-      @build = false
+      build!
     end
 
     # Resets the generator to a blank state
@@ -97,10 +97,21 @@ module DataBindings
       @native_constructors ||= {}
     end
 
+    def class_for(name, superclass = Object, &blk)
+      cls = Class.new(superclass, &blk)
+      for_native(name) { |props|
+        inst = cls.allocate
+        props.each do |k, v|
+          inst.instance_variable_set(:"@#{k}", v)
+        end
+        inst.send(:initialize)
+        inst
+      }
+    end
+
     private
     # @api private
     def build!
-      return if @built
       @adapters.each do |name, cls|
         unless @adapter_classes[name]
           @adapter_classes[name] = cls.to_s.split('::').inject(Object) {|const, n| const.const_get(n)}
@@ -118,7 +129,6 @@ module DataBindings
           end
         end
       end
-      @build = true
     end
   end
 

data/lib/data_bindings/version.rb

@@ -1,3 +1,3 @@
 module DataBindings
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ext/hashie.rb

@@ -0,0 +1,110 @@
+module Hashie
+  module Extensions
+    # IndifferentAccess gives you the ability to not care
+    # whether your hash has string or symbol keys. Made famous
+    # in Rails for accessing query and POST parameters, this
+    # is a handy tool for making sure your hash has maximum
+    # utility.
+    #
+    # One unique feature of this mixin is that it will recursively
+    # inject itself into sub-hash instances without modifying
+    # the actual class of the sub-hash.
+    #
+    # @example
+    #   class MyHash < Hash
+    #     include Hashie::Extensions::MergeInitializer
+    #     include Hashie::Extensions::IndifferentAccess
+    #   end
+    #
+    #   h = MyHash.new(:foo => 'bar', 'baz' => 'blip')
+    #   h['foo'] # => 'bar'
+    #   h[:foo]  # => 'bar'
+    #   h[:baz]  # => 'blip'
+    #   h['baz'] # => 'blip'
+    #
+    module IndifferentAccess
+      def self.included(base)
+        base.class_eval do
+          alias_method :regular_writer, :[]=
+          alias_method :[]=, :indifferent_writer
+          %w(default update fetch delete key? values_at).each do |m|
+            alias_method "regular_#{m}", m
+            alias_method m, "indifferent_#{m}"
+          end
+        end
+      end
+
+      # This will inject indifferent access into an instance of
+      # a hash without modifying the actual class. This is what
+      # allows IndifferentAccess to spread to sub-hashes.
+      def self.inject!(hash)
+        (class << hash; self; end).send :include, Hashie::Extensions::IndifferentAccess
+        hash.convert!
+      end
+
+      # Injects indifferent access into a duplicate of the hash
+      # provided. See #inject!
+      def self.inject(hash)
+        inject!(hash.dup)
+      end
+
+      def convert_key(key)
+        key.to_s
+      end
+
+      # Iterates through the keys and values, reconverting them to
+      # their proper indifferent state. Used when IndifferentAccess
+      # is injecting itself into member hashes.
+      def convert!
+        keys.each do |k|
+          regular_writer convert_key(k), convert_value(self.regular_delete(k))
+        end
+        self
+      end
+
+      def convert_value(value)
+        if hash_lacking_indifference?(value)
+          Hashie::Extensions::IndifferentAccess.inject(value.dup)
+        elsif value.is_a?(::Array)
+          value.dup.replace(value.map { |e| convert_value(e) })
+        else
+          value
+        end
+      end
+      
+      def indifferent_default(key = nil)
+        return self[convert_key(key)] if key?(key)
+        regular_default(key)
+      end
+
+      def indifferent_update(other_hash)
+        return regular_update(other_hash) if hash_with_indifference?(other_hash)
+        other_hash.each_pair do |k,v|
+          self[k] = v
+        end
+      end
+      
+      def indifferent_writer(key, value);  regular_writer convert_key(key), convert_value(value) end
+      def indifferent_fetch(key, *args);   regular_fetch  convert_key(key), *args                end
+      def indifferent_delete(key);         regular_delete convert_key(key)                       end
+      def indifferent_key?(key);           regular_key?   convert_key(key)                       end
+      def indifferent_values_at(*indices); indices.map{|i| self[i] }                             end
+
+      def indifferent_access?; true end
+      
+      protected
+
+      def hash_lacking_indifference?(other)
+        other.is_a?(::Hash) &&
+        !(other.respond_to?(:indifferent_access?) &&
+          other.indifferent_access?)
+      end
+
+      def hash_with_indifference?(other)
+        other.is_a?(::Hash) &&
+        other.respond_to?(:indifferent_access?) &&
+        other.indifferent_access?
+      end
+    end
+  end
+end

data/test/class_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path("../test_helper", __FILE__)
+
+describe "Data Bindings classes" do
+  before do
+    @generator = DataBindings::DefaultGenerator.new
+  end
+
+  describe "class generation" do
+    it "should create a basic class" do
+      @generator.type(:person) do
+        property :name
+        property :favorite_food
+      end
+      @generator.class_for(:person) do
+        def to_s
+          "#{@name} likes to eat #{@favorite_food}"
+        end
+      end
+
+      josh = @generator.from_ruby('name' => 'josh', 'favorite_food' => 'lasagna').bind(:person).to_native
+      assert_equal "josh likes to eat lasagna", josh.to_s
+    end
+  end
+
+end

metadata

@@ -1,41 +1,39 @@
 --- !ruby/object:Gem::Specification 
 name: data_bindings
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joshual Hull
+- Benjamin Coe
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: bson
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -173401151
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 0
-        - beta
-        version: 2.0.0.beta
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bson
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,7 +61,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: builder
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +75,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: httparty
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +89,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: minitest
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +103,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -119,7 +117,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: fakeweb
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -133,7 +131,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: yard
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -147,7 +145,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: redcarpet
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -161,7 +159,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: redcarpet
+  name: tnetstring
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -174,20 +172,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: tnetstring
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
 description: Bind data to and from things.
 email: 
 - joshbuddy@gmail.com
@@ -219,8 +203,10 @@ files:
 - lib/data_bindings/unbound.rb
 - lib/data_bindings/util.rb
 - lib/data_bindings/version.rb
+- lib/ext/hashie.rb
 - test/array_test.rb
 - test/bson_test.rb
+- test/class_test.rb
 - test/converter_test.rb
 - test/data_bindings_test.rb
 - test/fixtures/1.json
@@ -268,6 +254,7 @@ summary: Bind data to and from things
 test_files: 
 - test/array_test.rb
 - test/bson_test.rb
+- test/class_test.rb
 - test/converter_test.rb
 - test/data_bindings_test.rb
 - test/fixtures/1.json