chozo 0.3.0 → 0.4.0

data/lib/chozo.rb

@@ -5,6 +5,15 @@ module Chozo
   autoload :Platform, 'chozo/platform'
   autoload :RubyEngine, 'chozo/ruby_engine'
   autoload :VariaModel, 'chozo/varia_model'
+
+  class << self
+    # Path to the root directory of the Chozo application
+    #
+    # @return [Pathname]
+    def app_root
+      @app_root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+    end
+  end
 end
 
 require 'chozo/core_ext'

data/lib/chozo/config/abstract.rb

@@ -22,23 +22,9 @@ module Chozo
         mass_assign(attributes)
       end
 
-      def [](key)
-        self.attributes[key]
-      end
-
-      def []=(key, value)
-        self.attributes[key] = value
-      end
-
       def to_hash
         self.attributes.to_hash.deep_symbolize_keys
       end
-
-      protected
-
-        def mass_assign(new_attributes = {})
-          attributes.deep_merge!(new_attributes)
-        end
     end
   end
 end

data/lib/chozo/config/json.rb

@@ -1,5 +1,4 @@
 require 'chozo/errors'
-require 'multi_json'
 
 module Chozo
   module Config
@@ -27,23 +26,13 @@ module Chozo
         end
       end
 
-      # @param (see MultiJson.encode) options
-      #
-      # @return [String]
-      def to_json(options = {})
-        MultiJson.encode(self.attributes, options)
-      end
-      alias_method :as_json, :to_json
-
-      # @param (see MultiJson.decode) json
-      # @param (see MultiJson.decode) options
+      # @see {VariaModel#from_json}
       #
       # @raise [Chozo::Errors::InvalidConfig]
       #
-      # @return [~Chozo::Config::JSON]
-      def from_json(json, options = {})
-        mass_assign(MultiJson.decode(json, options))
-        self
+      # @return [Chozo::Config::JSON]
+      def from_json(*args)
+        super
       rescue MultiJson::DecodeError => e
         raise Chozo::Errors::InvalidConfig, e
       end

data/lib/chozo/core_ext/hash/dotted_paths.rb

@@ -77,6 +77,8 @@ class Hash
   #
   # @return [Object, nil]
   def dig(path)
+    return nil unless path.present?
+
     parts = path.split('.', 2)
     match = (self[parts[0].to_s] || self[parts[0].to_sym])
     if !parts[1] or match.nil?
@@ -95,7 +97,7 @@ class Hash
   #
   # @return [Array<String>]
   def dotted_paths(source = self, acc = Array.new, namespace = Array.new)
-    if source.is_a?(Hash)
+    if source.is_a?(Hash) && !source.empty?
       source.each do |key, value|
         branch = namespace.dup
         branch << key

data/lib/chozo/varia_model.rb

@@ -1,3 +1,4 @@
+require 'multi_json'
 require 'chozo/core_ext'
 require 'chozo/hashie_ext'
 
@@ -170,18 +171,60 @@ module Chozo
       @errors ||= HashWithIndifferentAccess.new
     end
 
+    def mass_assign(new_attrs = {})
+      attributes.dotted_paths.each do |dotted_path|
+        value = new_attrs.dig(dotted_path)
+        next if value.nil?
+
+        set_attribute(dotted_path, value)
+      end
+    end
+    alias_method :attributes=, :mass_assign
+
     # @param [#to_s] key
     #
     # @return [Object]
     def get_attribute(key)
       self.attributes.dig(key.to_s)
     end
+    alias_method :[], :get_attribute
 
     # @param [#to_s] key
     # @param [Object] value
     def set_attribute(key, value)
       self.attributes.deep_merge!(attributes.class.from_dotted_path(key.to_s, value))
     end
+    alias_method :[]=, :set_attribute
+
+    # @param [#to_hash] hash
+    #
+    # @return [self]
+    def from_hash(hash)
+      mass_assign(hash.to_hash)
+      self
+    end
+
+    # @param [String] data
+    #
+    # @return [self]
+    def from_json(data)
+      mass_assign(MultiJson.decode(data))
+      self
+    end
+
+    # @return [Hash]
+    def to_hash
+      self.attributes
+    end
+
+    # @option options [Boolean] :symbolize_keys
+    # @option options [Class, Symbol, String] :adapter
+    #
+    # @return [String]
+    def to_json(options = {})
+      MultiJson.encode(self.attributes, options)
+    end
+    alias_method :as_json, :to_json
 
     protected
 

data/lib/chozo/version.rb

@@ -1,3 +1,3 @@
 module Chozo
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/spec_helper.rb

@@ -32,6 +32,10 @@ if mri? && ENV['CI'] != 'true'
 
   Spork.each_run do
     require 'chozo'
+
+    Dir["#{Chozo.app_root}/lib/chozo/core_ext/**/*.rb"].each do |ext|
+      load(ext)
+    end
   end
 else
   require 'chozo'

data/spec/unit/chozo/core_ext/{hash_spec.rb → hash/dotted_paths_spec.rb}

@@ -73,6 +73,10 @@ describe Hash do
         subject.dig("we.found.something").should eql(:symbol_value)
       end
     end
+
+    it "returns nil if given a blank string" do
+      subject.dig("").should be_nil
+    end
   end
 
   describe "#dotted_paths" do
@@ -93,6 +97,19 @@ describe Hash do
       end
     end
 
+    context "given a hash with empty hashes as values" do
+      subject do
+        {
+          "one" => Hash.new,
+          "two" => Hash.new
+        }
+      end
+
+      it "returns an array of the top level keys as strings" do
+        subject.dotted_paths.should eql(["one", "two"])
+      end
+    end
+
     context "given a hash with nested keys" do
       subject do
         {

data/spec/unit/chozo/varia_model_spec.rb

@@ -451,4 +451,122 @@ describe Chozo::VariaModel do
       subject.get_attribute('brooke.costantini').should be_nil
     end
   end
+
+  describe "#mass_assign" do
+    subject do
+      Class.new do
+        include Chozo::VariaModel
+
+        attribute 'brooke.winsor', type: String, default: 'sister'
+        attribute 'jamie.winsor', type: String, default: 'brother'
+        attribute 'gizmo', type: String, default: 'dog'
+      end.new
+    end
+
+    it "sets the values of all matching defined attributes" do
+      new_attrs = {
+        brooke: {
+          winsor: "other"
+        },
+        jamie: {
+          winsor: "other_two"
+        }
+      }
+
+      subject.mass_assign(new_attrs)
+      subject.brooke.winsor.should eql("other")
+      subject.jamie.winsor.should eql("other_two")
+    end
+
+    it "leaves the values of untouched attributes" do
+      new_attrs = {
+        brooke: {
+          winsor: "other"
+        },
+        jamie: {
+          winsor: "other_two"
+        }
+      }
+
+      subject.mass_assign(new_attrs)
+      subject.gizmo.should eql("dog")
+    end
+
+    it "ignores values which are not defined attributes" do
+      new_attrs = {
+        undefined_attribute: "value"
+      }
+
+      subject.mass_assign(new_attrs)
+      subject.should_not respond_to(:undefined_attribute)
+    end
+  end
+
+  describe "#from_json" do
+    subject do
+      Class.new do
+        include Chozo::VariaModel
+
+        attribute 'first_name', type: String
+        attribute 'nick', type: String
+      end.new
+    end
+
+    it "returns self" do
+      subject.from_json(MultiJson.encode(first_name: "jamie", nick: "reset")).should be_a(described_class)
+    end
+
+    it "updates self from JSON data" do
+      subject.from_json(MultiJson.encode(first_name: "jamie", nick: "reset"))
+
+      subject.first_name.should eql("jamie")
+      subject.nick.should eql("reset")
+    end
+  end
+
+  describe "#from_hash" do
+    subject do
+      Class.new do
+        include Chozo::VariaModel
+
+        attribute 'first_name', type: String
+        attribute 'nick', type: String
+      end.new
+    end
+
+    it "returns self" do
+      subject.from_hash(first_name: "jamie", nick: "reset").should be_a(described_class)
+    end
+
+    it "updates and returns self from a Hash" do
+      subject.from_hash(first_name: "jamie", nick: "reset")
+
+      subject.first_name.should eql("jamie")
+      subject.nick.should eql("reset")
+    end
+  end
+
+  describe "#to_json" do
+    subject do
+      Class.new do
+        include Chozo::VariaModel
+
+        attribute 'first_name', type: String
+        attribute 'nick', type: String
+      end.new
+    end
+
+    it "returns a JSON string containin the serialized attributes" do
+      subject.first_name = "brooke"
+      subject.nick = "leblanc"
+
+      subject.to_json.should eql(MultiJson.encode(first_name: "brooke", nick: "leblanc"))
+    end
+  end
+
+  describe "#to_hash" do
+    it "returns the attributes" do
+      subject.to_hash.should eql(subject.attributes)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chozo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,7 +100,7 @@ files:
 - spec/support/matchers/each.rb
 - spec/unit/chozo/config/abstract_spec.rb
 - spec/unit/chozo/config/json_spec.rb
-- spec/unit/chozo/core_ext/hash_spec.rb
+- spec/unit/chozo/core_ext/hash/dotted_paths_spec.rb
 - spec/unit/chozo/platform_spec.rb
 - spec/unit/chozo/ruby_engine_spec.rb
 - spec/unit/chozo/varia_model_spec.rb
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3239723575146630686
+      hash: -4510203401888880792
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -139,7 +139,7 @@ test_files:
 - spec/support/matchers/each.rb
 - spec/unit/chozo/config/abstract_spec.rb
 - spec/unit/chozo/config/json_spec.rb
-- spec/unit/chozo/core_ext/hash_spec.rb
+- spec/unit/chozo/core_ext/hash/dotted_paths_spec.rb
 - spec/unit/chozo/platform_spec.rb
 - spec/unit/chozo/ruby_engine_spec.rb
 - spec/unit/chozo/varia_model_spec.rb