magnum-pi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cd9a3d3c2d6311e67d66f570204977ef0c8f92f8
-  data.tar.gz: f37c6513dce427b361a6e444838cbce58788dfec
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWU5NmI1MjVkYTk4NzA0YzU4OWRmYzU1YzYwNjBiYjBmN2FiNGVmMA==
+  data.tar.gz: !binary |-
+    MGRiZGM0NGY4YjA3YzhlY2U5Mzg4YTFmNWYwMmIwOGIwYTJmNzA2Zg==
 SHA512:
-  metadata.gz: e8a4a9cda2fdc04a4f4bb7fc4b0cf74fbbcdeb6ee480890294ca530fdecdf2c165c5c0a91ff5fd3647d9038ba627feeeb8dc4aa08b11c7d1aa30206189e3c57f
-  data.tar.gz: 289158b4bddb10283c3be3c8c1ac3e06180be30dfdadcd2f2b0017fa48428d2552f829c6791e84c8936f6be1744cce7b842c6876284caadc065ef67cc617070d
+  metadata.gz: !binary |-
+    NWU3MGMyMjRkNDljNzNmZDM0ZGZkYzI5ZGIzM2U4NjczMGFhNTk1YTVmNDJj
+    YWM3NDQxZDJjYTllMmQ4ZTRkODIwOGRjNzU3YjE4NTFjZDhlNjU3N2IwNWYy
+    MjQwOGM2YjYxZTc0ZGFiZTBlNjg3NjAwM2IxYjhlZTkzYTIxYWQ=
+  data.tar.gz: !binary |-
+    Zjk0YjUxY2NmMjkxODQzOGM0ZTFlYjAwMjIyMTdkNmM4MmUxM2M2YmM3MTYw
+    ODI4YzU1ZDU5OTEwMTk2MmFmNDJkZjFiNzA5YzI2ZTQyYzYxMmZiZTQ3MTYy
+    ZmMwZWRmZDUwNWUxOWE5ZGU1MmUzNTk2ZjU4ZmM3YmNiNTYyY2U=

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = MagnumPI CHANGELOG
 
+== Version 0.1.4 (June 12, 2014)
+
+* Extended Kernel, Class, Array and Hash with #deep_clone
+* Corrected inheritance behavior when inheriting from an API interface by deep cloning
+* Corrected finalizing API schemes by deep cloning
+
 == Version 0.1.3 (March 27, 2014)
 
 * Tackling arrays within Mechanize::Util.build_query_string

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/magnum-pi/api/inheritance.rb

@@ -0,0 +1,12 @@
+module MagnumPI
+  module API
+    module Inheritance
+
+      def inherited(base)
+        base.instance_variable_set :@api, @api.deep_clone
+        base.instance_variable_set :@resources, @resources.deep_clone
+      end
+
+    end
+  end
+end

data/lib/magnum-pi/api/scheme.rb

@@ -9,17 +9,31 @@ module MagnumPI
       end
 
       def finalize(params = {})
-        @types = (types = _types).dup
-        @values = (values = _values).dup
+        @types = (types = _types).deep_clone
+        @values = (values = _values).deep_clone
+
         params.each do |name, value|
           process_value name, [value], nil
         end
+
         to_hash
       ensure
         @types = types
         @values = values
       end
 
+      def deep_clone
+        clone = super
+
+        types = @types.deep_clone if @types
+
+        clone.instance_eval do
+          @types = types
+        end
+
+        clone
+      end
+
     private
 
       def _types
@@ -27,9 +41,14 @@ module MagnumPI
       end
 
       def process_value(name, args, block)
-        is_a_class = (value = args[0]).class == ::Class
-        set_type name, is_a_class ? value : value.class
-        set_value name, value unless is_a_class
+        value = args[0]
+        if name == :resources
+          (_values[name] ||= {}).merge! value
+        else
+          is_a_class = value.class == ::Class
+          set_type name, is_a_class ? value : value.class
+          set_value name, value unless is_a_class
+        end
       end
 
       def set_type(name, type)

data/lib/magnum-pi/api.rb

@@ -1,3 +1,4 @@
+require "magnum-pi/api/inheritance"
 require "magnum-pi/api/scheme"
 require "magnum-pi/api/resources"
 require "magnum-pi/api/instance"
@@ -8,6 +9,7 @@ module MagnumPI
 
     def self.extended(base)
       if base.is_a? Class
+        base.extend Inheritance
         base.send :include, Instance
         base.send :include, Consumer
       else

data/lib/magnum-pi/core_ext/deep_clone.rb

@@ -0,0 +1,65 @@
+module Kernel
+
+  def deep_clone(cache = {})
+    return cache[self] if cache.key?(self)
+
+    begin
+      copy = clone
+    rescue
+      return cache[self] = self
+    end
+
+    cache[self] = copy
+
+    copy.instance_variables.each do |name|
+      begin
+        var = instance_variable_get(name).deep_clone(cache)
+        copy.instance_variable_set name, var
+      rescue TypeError
+      end
+    end
+
+    copy
+  end
+
+end
+
+class Class
+
+  def deep_clone(cache = {})
+    self
+  end
+
+end
+
+class Array
+
+  def deep_clone(cache = {})
+    return cache[self] if cache.key?(self)
+
+    copy = super
+
+    each_with_index do |value, index|
+      copy[index] = value.deep_clone(cache)
+    end
+
+    copy
+  end
+
+end
+
+class Hash
+
+  def deep_clone(cache = {})
+    return cache[self] if cache.key?(self)
+
+    copy = super
+
+    each do |key, value|
+      copy[key] = value.deep_clone(cache)
+    end
+
+    copy
+  end
+
+end

data/lib/magnum-pi/core_ext.rb

@@ -0,0 +1 @@
+require "magnum-pi/core_ext/deep_clone"

data/lib/magnum-pi/dsl.rb

@@ -30,6 +30,20 @@ module MagnumPI
       _values.to_s
     end
 
+    def deep_clone
+      clone = self.class.new
+
+      valid_keys = @valid_keys.deep_clone if @valid_keys
+      values = @values.deep_clone if @values
+
+      clone.instance_eval do
+        @valid_keys = valid_keys
+        @values = values
+      end
+
+      clone
+    end
+
   private
 
     def _values

data/lib/magnum-pi/version.rb

@@ -1,7 +1,7 @@
 module MagnumPI
   MAJOR = 0
   MINOR = 1
-  TINY  = 3
+  TINY  = 4
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/lib/magnum-pi.rb

@@ -3,6 +3,7 @@ require "oj"
 require "xmlsimple"
 require "active_support/core_ext/object/to_query"
 
+require "magnum-pi/core_ext"
 require "magnum-pi/gem_ext"
 require "magnum-pi/dsl"
 require "magnum-pi/api"

data/test/test_helper/minitest.rb

@@ -0,0 +1,10 @@
+class MiniTest::Test
+  def setup
+    $stringio ||= StringIO.new
+    $stdout = $stringio
+  end
+  def teardown
+    $stdout = STDOUT
+    $stringio.truncate $stringio.rewind
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require_relative "test_helper/coverage"
 
+require "minitest"
 require "minitest/autorun"
 require "mocha/setup"
 
@@ -8,4 +9,6 @@ def path(path)
 end
 
 require "bundler"
-Bundler.require :default, :development, :test
+Bundler.require :default, :development, :test
+
+require_relative "test_helper/minitest"

data/test/unit/api/test_scheme.rb

@@ -24,13 +24,19 @@ module Unit
         describe "#finalize" do
           it "foo" do
             @scheme.foo String
-            @scheme.bar "bar"
+            @scheme.bar :baz => "qux"
             object_id = @scheme.instance_eval("_values").object_id
 
-            assert_equal({:bar => "bar"}, @scheme.finalize)
-            assert_equal({:foo => "foo", :bar => "bar"}, @scheme.finalize(:foo => "foo"))
+            assert_equal({:bar => {:baz => "qux"}}, @scheme.finalize)
+            assert_equal({:foo => "foo", :bar => {:baz => "qux"}}, @scheme.finalize(:foo => "foo"))
             assert_equal object_id, @scheme.instance_eval("_values").object_id
-            assert_equal({:foo => "FOO", :bar => "bar"}, @scheme.finalize(:foo => "FOO"))
+            assert_equal({:foo => "FOO", :bar => {:baz => "qux"}}, @scheme.finalize(:foo => "FOO"))
+
+            finalized = @scheme.finalize :foo => "foo"
+            assert_equal({:bar => {:baz => "qux"}}, @scheme.instance_eval("_values"))
+
+            finalized[:bar][:baz] = "QUX"
+            assert_equal({:bar => {:baz => "qux"}}, @scheme.instance_eval("_values"))
 
             assert_raises ArgumentError do
               @scheme.finalize :foo => :foo

data/test/unit/core_ext/test_deep_clone.rb

@@ -0,0 +1,43 @@
+require_relative "../../test_helper"
+
+module Unit
+  module CoreExt
+    class TestDeepClone < MiniTest::Test
+
+      describe "#deep_clone" do
+        it "returns a deep clone of the instance" do
+          array = [1, 2, 3]
+          array.instance_variable_set :@array, %w(4 5 6)
+
+          instance = {
+            :a => array,
+            :b => "Hello",
+            :c => {
+              "alpha" => [4, 5],
+              "beta" => [5, 6]
+            }
+          }
+
+          clone = instance.deep_clone
+          assert_equal instance, clone
+          assert_equal instance[:a].instance_variable_get(:@array), clone[:a].instance_variable_get(:@array)
+
+          clone.merge! :d => [1, 2, 3]
+          assert_equal [:a, :b, :c], instance.keys
+          assert_equal [:a, :b, :c, :d], clone.keys
+          assert_equal [1, 2, 3], clone[:d]
+          assert_equal instance, clone.reject{|k, v| k == :d}
+
+          clone[:a].instance_variable_get(:@array) << "7"
+          assert_equal %w(4 5 6), instance[:a].instance_variable_get(:@array)
+          assert_equal %w(4 5 6 7), clone[:a].instance_variable_get(:@array)
+
+          clone[:a] << 4
+          assert_equal [1, 2, 3], instance[:a]
+          assert_equal [1, 2, 3, 4], clone[:a]
+        end
+      end
+
+    end
+  end
+end

data/test/unit/test_api.rb

@@ -88,5 +88,53 @@ module Unit
       end
     end
 
+    class FooAPI
+      extend MagnumPI::API
+      api do
+        uri String
+        format :xml
+        api_key String
+        resources({
+          "foo/Bars" => {
+            :params => {
+              :start_date => Date,
+              :end_date => Date
+            }
+          }
+        })
+      end
+      resources do
+        bars :get, "foo/Bars", {:start_date => Date.today}
+      end
+    end
+
+    class BarAPI < FooAPI
+      api do
+        resources({
+          "baz/Quxs" => {}
+        })
+      end
+      resources do
+        quxs :get, "baz/Quxs"
+      end
+    end
+
+    describe "inheritance" do
+      describe ".api" do
+        it "inherits the API definition of its parent" do
+          assert BarAPI.api != nil
+          assert BarAPI.api.__id__ != FooAPI.api.__id__
+          assert_equal FooAPI.api.to_hash.tap{|h| h[:resources].merge!("baz/Quxs" => {})}, BarAPI.api.to_hash
+        end
+      end
+      describe ".resources" do
+        it "inherits the resources definition of its parent" do
+          assert BarAPI.resources != nil
+          assert BarAPI.resources.__id__ != FooAPI.resources.__id__
+          assert_equal FooAPI.resources.to_hash.merge(:quxs => [:get, "baz/Quxs"]), BarAPI.resources.to_hash
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: magnum-pi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Create an easy interface to talk with APIs
@@ -154,9 +154,12 @@ files:
 - lib/magnum-pi.rb
 - lib/magnum-pi/api.rb
 - lib/magnum-pi/api/consumer.rb
+- lib/magnum-pi/api/inheritance.rb
 - lib/magnum-pi/api/instance.rb
 - lib/magnum-pi/api/resources.rb
 - lib/magnum-pi/api/scheme.rb
+- lib/magnum-pi/core_ext.rb
+- lib/magnum-pi/core_ext/deep_clone.rb
 - lib/magnum-pi/dsl.rb
 - lib/magnum-pi/gem_ext.rb
 - lib/magnum-pi/gem_ext/mechanize.rb
@@ -168,10 +171,12 @@ files:
 - script/console
 - test/test_helper.rb
 - test/test_helper/coverage.rb
+- test/test_helper/minitest.rb
 - test/unit/api/test_consumer.rb
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb
 - test/unit/api/test_scheme.rb
+- test/unit/core_ext/test_deep_clone.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb
 - test/unit/test_magnum-pi.rb
@@ -184,27 +189,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Create an easy interface to talk with APIs
 test_files:
 - test/test_helper.rb
 - test/test_helper/coverage.rb
+- test/test_helper/minitest.rb
 - test/unit/api/test_consumer.rb
 - test/unit/api/test_instance.rb
 - test/unit/api/test_resources.rb
 - test/unit/api/test_scheme.rb
+- test/unit/core_ext/test_deep_clone.rb
 - test/unit/test_api.rb
 - test/unit/test_dsl.rb
 - test/unit/test_magnum-pi.rb