hibachi 0.0.1.pre → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d51833915516bde538031d378a015bcac41b0d
-  data.tar.gz: ca5f2c393ab648c57a620a2f74b2f30fbecb64d7
+  metadata.gz: 54dc5e3824748620f18d9f3042b2ddd98416a874
+  data.tar.gz: 245a686100d27ee774ef1c4f9bd0d56b113c4d66
 SHA512:
-  metadata.gz: 6cfc2e1dec973836c824094c604d5c338274eb9883f59ef5fb2e2feedc67056b7e743e0a24770f2f11ccd8629d9b7c9ac5fc66966a8d81e677f6d718d8095d1b
-  data.tar.gz: 19c4b64c853cbe399769e6a8759e7c8c4aca6263da7d53258918711cee39784e4c7c1d274d33f86c015926ee077795c65ac9cb866138631cab298015f84bdd08
+  metadata.gz: 1f0070bd2bf79c7c7e33d2374c04cdc0cf1b8f2bb9938d008cb345c14aca44b0991ec7b14f6b5ba73ad1930487f6b97c4f4299e2741710910e0da499985ef219
+  data.tar.gz: 56b4d417289b1ee8579056eaeb9477d896b937396041e819382249719e0e42a4a99938e75bda9b9c5d164a29f49d3cb3109d285696d2e3e578d363a3408675a4

data/lib/hibachi/node.rb

@@ -11,7 +11,7 @@ module Hibachi
     include ActiveModel::Model
     include Enumerable
 
-    attr_accessor :attributes, :file_path
+    attr_accessor :file_path
 
     validates :file_path, presence: true
 
@@ -45,7 +45,7 @@ module Hibachi
       attributes[key]
     end
 
-    # Set the attribute at a given key.
+    # Set the attribute at a given key and update the JSON.
     def []= key, value
       merge! key => value
     end
@@ -74,8 +74,10 @@ module Hibachi
       @attributes ||= parsed_json_attributes[Hibachi.config.cookbook] || {}
     end
 
-    delegate :any?, :to => :attributes
-    delegate :empty?, :to => :attributes
+    def method_missing(method, *arguments)
+      attributes.send method, *arguments if attributes.respond_to? method
+      super
+    end
 
     protected
     # All attributes as parsed from the Chef JSON.

data/lib/hibachi/persistence.rb

@@ -1,6 +1,6 @@
 module Hibachi
   # Backend data store methods for the Hibachi::Model
-  module Store
+  module Persistence
     extend ActiveSupport::Concern
 
     # Merge attrs and write to JSON.

data/lib/hibachi/querying.rb

@@ -1,5 +1,7 @@
 module Hibachi
   module Querying
+    include Enumerable
+
     # Write the given attrs to config and re-run Chef.
     def create from_attributes={}
       model = new from_attributes
@@ -13,6 +15,10 @@ module Hibachi
       node[recipe_name].map { |from_params| new from_params }
     end
 
+    def each
+      all.each { |model| yield model }
+    end
+
     # Find all objects of this type matching the given search
     # criteria. Uses the all() method to scope calls from within the
     # proper JSON for this class, and instantiates objects based on

data/lib/hibachi/recipe.rb

@@ -13,8 +13,8 @@ module Hibachi
       # touch this name. By default, this creates a 'collection' recipe.
       def recipe name, options={}
         self.recipe_name = name
-        from_opts = "#{options[:type]}" || 'collection'
-        self.recipe_type = ActiveSupport::StringInquirer.new from_opts
+        from_opts = options[:type] || 'collection'
+        self.recipe_type = ActiveSupport::StringInquirer.new from_opts.to_s
       end
 
       # An alias for `recipe` to give parity to `singleton_recipe`.
@@ -38,11 +38,11 @@ module Hibachi
     # Return the recipe type as set in the class definition. It's a
     # StringInquirer, so it defines methods that allow us to test
     # whether this is a `collection?` or a `singleton?`.
-    def type
+    def recipe_type
       self.class.recipe_type
     end
 
-    delegate :collection?, :to => :type
-    delegate :singleton?, :to => :type
+    delegate :collection?, :to => :recipe_type
+    delegate :singleton?, :to => :recipe_type
   end
 end

data/lib/hibachi/version.rb

@@ -1,3 +1,3 @@
 module Hibachi
-  VERSION = "0.0.1.pre"
+  VERSION = "0.0.1"
 end

data/spec/fixtures/chef.json

@@ -1,7 +1,4 @@
 {
   "test": {
-    "mock_settings": {
-      "name": "store"
-    }
   }
 }

data/spec/hibachi/chef_runner_spec.rb

@@ -13,12 +13,12 @@ module Hibachi
     end
 
     it "runs chef" do
-      subject.stub(:run) { true }
+      allow(subject).to receive(:run).and_return true
       expect(subject.run_chef(:pro)).to eq(true)
     end
 
     it "runs chef in the background" do
-      subject.stub(:run_chef_in_bg) { true }
+      allow(subject).to receive(:run_chef_in_bg).and_return true
       expect(subject.run_chef(:pro, background: true)).to eq(true)
     end
   end

data/spec/hibachi/{store_spec.rb → persistence_spec.rb}

@@ -1,9 +1,11 @@
 require 'spec_helper'
-require 'hibachi/store'
+require 'hibachi/persistence'
 
 module Hibachi
-  describe Store do
+  describe Persistence do
     it "creates a new model from scratch" do
+      expect(MockSetting.recipe_name).to eq(:mock_settings)
+      expect(MockSetting).to be_singleton
       setting = MockSetting.create(name: 'from-scratch')
       expect(setting).to be_persisted
       expect(setting.destroy).to eq(true)

data/spec/hibachi/recipe_spec.rb

@@ -3,30 +3,53 @@ require 'hibachi/recipe'
 
 module Hibachi
   describe Recipe do
-    class MockForRecipe < Hibachi::Model
-      recipe :name_of_recipe, :type => :singleton
+    context "with a singleton setting" do
+      subject { SingletonSetting }
 
-      attr_accessor :name
-    end
+      it "sets the recipe in the class definition" do
+        expect(subject.recipe_name).to eq(:singleton_settings)
+      end
 
-    it "sets the recipe in the class definition" do
-      expect(MockForRecipe.recipe_name).to eq(:name_of_recipe)
-    end
+      it "sets the type of recipe in the class definition" do
+        expect(subject.recipe_type).to eq('singleton')
+      end
 
-    it "sets the type of recipe in the class definition" do
-      expect(MockForRecipe.recipe_type).to eq('singleton')
-    end
+      it "is a singleton" do
+        expect(subject).to be_singleton
+      end
 
-    it "is a singleton" do
-      expect(MockForRecipe).to be_singleton
+      context "with an instantiated setting" do
+        let(:setting) { subject.new name: 'test' }
+
+        it "is a singleton" do
+          expect(setting).to be_singleton
+        end
+      end
     end
 
-    context "with an instantiated singleton" do
-      subject { MockForRecipe.new name: 'test' }
+    context "with a collection setting" do
+      subject { MockSetting }
 
-      it "is a singleton" do
-        expect(subject).to be_singleton
+      it "sets the recipe in the class definition" do
+        expect(subject.recipe_name).to eq(:mock_settings)
+      end
+
+      it "sets the type of recipe in the class definition" do
+        expect(subject.recipe_type).to eq('collection')
+      end
+
+      it "is a collection" do
+        expect(subject).to be_collection
+      end
+
+      context "with an instantiated setting" do
+        let(:setting) { subject.new name: 'test' }
+
+        it "is a collection" do
+          expect(setting).to be_collection
+        end
       end
     end
+
   end
 end

data/spec/support/mock_setting.rb

@@ -1,10 +1,9 @@
 require 'hibachi'
 
 class MockSetting < Hibachi::Model
-
   recipe :mock_settings
 
-  attr_accessor :attributes, :name, :is_active
+  attr_accessor :name, :is_active
 
   validates :name, :presence => true
 

data/spec/support/singleton_setting.rb

@@ -0,0 +1,5 @@
+class SingletonSetting < Hibachi::Model
+  recipe :singleton_settings, :type => :singleton
+
+  attr_accessor :name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hibachi
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1
 platform: ruby
 authors:
 - Tom Scott
@@ -214,12 +214,13 @@ files:
 - spec/hibachi/configuration_spec.rb
 - spec/hibachi/model_spec.rb
 - spec/hibachi/node_spec.rb
+- spec/hibachi/persistence_spec.rb
 - spec/hibachi/recipe_spec.rb
-- spec/hibachi/store_spec.rb
 - spec/hibachi_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_setting.rb
 - spec/support/mock_singleton.rb
+- spec/support/singleton_setting.rb
 homepage: http://github.com/tubbo/hibachi
 licenses:
 - NCSA
@@ -235,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -290,10 +291,11 @@ test_files:
 - spec/hibachi/configuration_spec.rb
 - spec/hibachi/model_spec.rb
 - spec/hibachi/node_spec.rb
+- spec/hibachi/persistence_spec.rb
 - spec/hibachi/recipe_spec.rb
-- spec/hibachi/store_spec.rb
 - spec/hibachi_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_setting.rb
 - spec/support/mock_singleton.rb
+- spec/support/singleton_setting.rb
 has_rdoc: