kartograph 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd413914c014eb3f1127307accfe7415bd9cf5e0
-  data.tar.gz: 6f9f614581f8542da63cf5ed48253058608e37aa
+  metadata.gz: 3a573a744b7b213bb2721c5309cdeec2ea3fce35
+  data.tar.gz: 029172328c658996de6163c4473e6894e5a1f698
 SHA512:
-  metadata.gz: 0df0e80384d6964490b4bd1102dbccc597e21c2bfc0c60bad4d2326541845f86cc1ed15200db6f79a831f904dcb062366993cc441581718114ac79577e43fb93
-  data.tar.gz: 62da5885c11e5f6445e4d8132e91f70256b6a16966de26cbe35b2d38bb037b6e29a94fe7ab6bbe90d95e72fa1229de8d6a253a5b107279feff6432f30a2c327d
+  metadata.gz: ed413d7e3ce8cfc5506f427dd1dd6193e63eacedd492b02749bb4702603d7fd03b2ce57b07e2044fc77eb6d58d1e87c49af62b628ea6b942b4557a2b55bc80dc
+  data.tar.gz: bbdb12c55b428908117b1c03d19b0b74e408d682f40f72757a5a8982765039ac2c828ebca6f02554874adf7c68379aff57b81f9592a4b63a1b607b0b518e08d3

data/README.md

@@ -2,7 +2,7 @@
 
 A Serialization / Deserialization library.
 
-[![Build Status](https://travis-ci.org/digitaloceancloud/kartograph.svg?branch=master)](https://travis-ci.org/digitaloceancloud/kartograph)
+[![Build Status](https://travis-ci.org/digitalocean/kartograph.svg?branch=master)](https://travis-ci.org/digitalocean/kartograph)
 
 ## Installation
 

data/lib/kartograph/map.rb

@@ -1,7 +1,18 @@
+require 'thread'
+
 module Kartograph
   class Map
+    def initialize
+      @scope_mutex = Mutex.new
+    end
+
     def property(*args, &block)
       options = args.last.is_a?(Hash) ? args.pop : {}
+
+      # Append scopes if we're currently mapping in a scoped block
+      options[:scopes] ||= []
+      options[:scopes] += Array(@current_scopes)
+
       args.each do |prop|
         properties << Property.new(prop, options, &block)
       end
@@ -12,8 +23,13 @@ module Kartograph
     end
 
     def scoped(*scopes, &block)
-      proxy = ScopeProxy.new(self, scopes)
-      proxy.instance_eval(&block)
+      @scope_mutex.synchronize do
+        @current_scopes = scopes
+
+        instance_eval(&block) if block_given?
+
+        @current_scopes = nil
+      end
     end
 
     def root_keys
@@ -65,7 +81,7 @@ module Kartograph
     end
 
     def ==(other)
-      methods = %i(properties root_keys mapping)
+      methods = %i(properties root_keys mapping cache cache_key)
       methods.inject(true) do |current_value, method|
         break unless current_value
         send(method) == other.send(method)

data/lib/kartograph/property.rb

@@ -66,4 +66,4 @@ module Kartograph
       plural? ? Array(value).map {|v| Artist.new(v, map).draw(scope) } : Artist.new(value, map).draw(scope)
     end
   end
-end
+end

data/lib/kartograph/root_key.rb

@@ -7,7 +7,7 @@ module Kartograph
     end
 
     def scopes
-      options[:scopes] || []
+      Array(options[:scopes]) || []
     end
 
     %i(singular plural).each do |method|

data/lib/kartograph/sculptor.rb

@@ -12,6 +12,8 @@ module Kartograph
     end
 
     def sculpt(scope = nil)
+      return nil if @object.nil?
+
       # Initializing the object we're coercing so we can set attributes on it
       coerced = map.mapping.new
       scoped_properties = scope ? properties.filter_by_scope(scope) : properties
@@ -23,4 +25,4 @@ module Kartograph
       end
     end
   end
-end
+end

data/lib/kartograph/version.rb

@@ -1,4 +1,4 @@
 module Kartograph
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 

data/spec/lib/kartograph/property_spec.rb

@@ -232,4 +232,4 @@ describe Kartograph::Property do
       expect(duped.options).to eq(instance.options)
     end
   end
-end
+end

data/spec/lib/kartograph/root_key_spec.rb

@@ -15,6 +15,11 @@ describe Kartograph::RootKey do
       instance = Kartograph::RootKey.new(scopes: [:read])
       expect(instance.scopes).to eq([:read])
     end
+
+    it 'reads the scopes as an array always' do
+      instance = Kartograph::RootKey.new(scopes: :read)
+      expect(instance.scopes).to eq([:read])
+    end
   end
 
   describe '#singular' do

data/spec/lib/kartograph/sculptor_spec.rb

@@ -17,6 +17,11 @@ describe Kartograph::Sculptor do
     let(:map) { Kartograph::Map.new }
     let(:object) { { 'id' => 343, 'name' => 'Guilty Spark', 'email_address' => 'guilty@bungie.net' } }
 
+    it 'returns nil if the object in nil' do
+      sculptor = Kartograph::Sculptor.new(nil, map)
+      expect(sculptor.sculpt).to be_nil
+    end
+
     context 'without a scope' do
       before do
         map.mapping DummyUser
@@ -75,4 +80,4 @@ describe Kartograph::Sculptor do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kartograph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,6 @@ files:
 - lib/kartograph/property.rb
 - lib/kartograph/property_collection.rb
 - lib/kartograph/root_key.rb
-- lib/kartograph/scope_proxy.rb
 - lib/kartograph/sculptor.rb
 - lib/kartograph/version.rb
 - spec/lib/kartograph/artist_spec.rb
@@ -102,7 +101,6 @@ files:
 - spec/lib/kartograph/property_collection_spec.rb
 - spec/lib/kartograph/property_spec.rb
 - spec/lib/kartograph/root_key_spec.rb
-- spec/lib/kartograph/scope_proxy_spec.rb
 - spec/lib/kartograph/sculptor_spec.rb
 - spec/spec_helper.rb
 - spec/support/dsl_contexts.rb
@@ -140,7 +138,6 @@ test_files:
 - spec/lib/kartograph/property_collection_spec.rb
 - spec/lib/kartograph/property_spec.rb
 - spec/lib/kartograph/root_key_spec.rb
-- spec/lib/kartograph/scope_proxy_spec.rb
 - spec/lib/kartograph/sculptor_spec.rb
 - spec/spec_helper.rb
 - spec/support/dsl_contexts.rb

data/lib/kartograph/scope_proxy.rb

@@ -1,17 +0,0 @@
-module Kartograph
-  class ScopeProxy
-    attr_reader :map, :scopes
-
-    def initialize(map, scopes)
-      @map, @scopes = map, scopes
-    end
-
-    def property(*args, &block)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      options[:scopes] = scopes
-      args << options
-
-      map.property(*args, &block)
-    end
-  end
-end

data/spec/lib/kartograph/scope_proxy_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Kartograph::ScopeProxy do
-  describe '#initialize' do
-    it 'initializes with a map, scopes, and a block' do
-      map, scopes = double, [:read, :write]
-
-      instance = Kartograph::ScopeProxy.new(map, scopes)
-
-      expect(instance.map).to be(map)
-      expect(instance.scopes).to be(scopes)
-    end
-  end
-
-  describe '#property' do
-    let(:map) { Kartograph::Map.new }
-    subject(:proxy) { Kartograph::ScopeProxy.new(map, [:read, :write]) }
-
-    it 'adds a property to the properties with the correct scope' do
-      proxy.property :hello
-      proxy.property :world
-
-      read_properties = map.properties.filter_by_scope(:read)
-      expect(read_properties.map(&:name)).to eq([:hello, :world])
-
-      write_properties = map.properties.filter_by_scope(:write)
-      expect(write_properties.map(&:name)).to eq([:hello, :world])
-    end
-  end
-end