cistern 0.1.2 → 0.1.4

data/lib/cistern/attributes.rb

@@ -130,7 +130,7 @@ module Cistern::Attributes
           elsif self.respond_to?("#{key}=", true)
             send("#{key}=", value)
           else
-            attributes[key] = value
+            # ignore data: unknown attribute : attributes[key] = value
           end
         end
       end

data/lib/cistern/model.rb

@@ -4,16 +4,8 @@ class Cistern::Model
 
   attr_accessor :collection, :connection
 
-  def self.formatter
-    @formatter ||= Cistern::Formatter::Default
-  end
-
-  def self.formatter=(formatter)
-    @formatter = formatter
-  end
-
   def inspect
-    self.class.formatter.call(self)
+    Cistern.formatter.call(self)
   end
 
   def initialize(attributes={})

data/lib/cistern/service.rb

@@ -1,9 +1,10 @@
 class Cistern::Service
-  def self.mock!;   @mocking= true; end
+
+  def self.mock!;    @mocking = true; end
   def self.mocking?; @mocking; end
-  def self.unmock!; @mocking= false; end
-  module Collections
+  def self.unmock!;  @mocking = false; end
 
+  module Collections
     def collections
       service.collections
     end
@@ -15,8 +16,8 @@ class Cistern::Service
     def requests
       service.requests
     end
-
   end
+
   class << self
     def inherited(klass)
       klass.class_eval <<-EOS, __FILE__, __LINE__
@@ -32,6 +33,7 @@ class Cistern::Service
         end
       EOS
     end
+
     def model_path(model_path)
       @model_path = model_path
     end
@@ -68,8 +70,8 @@ class Cistern::Service
       self.recognized_arguments.concat(args)
     end
 
-    def model(model_name)
-      models << model_name
+    def model(model_name, options={})
+      models << [model_name, options]
     end
 
     def mocked_requests
@@ -100,8 +102,14 @@ class Cistern::Service
     def setup_requirements
       @required ||= false
       unless @required
-        models.each do |model|
-          require File.join(@model_path, model.to_s)
+        models.each do |model, options|
+          require File.join(@model_path, model.to_s) unless options[:require] == false
+          class_name = model.to_s.split("_").map(&:capitalize).join
+          self.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
+            def #{model}(attributes={})
+              #{service}::#{class_name}.new({connection: self}.merge(attributes))
+            end
+          EOS
         end
         requests.each do |request|
           require File.join(@request_path, request.to_s)

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/cistern.rb

@@ -14,12 +14,8 @@ module Cistern
 
   autoload :Formatter, 'cistern/formatter'
 
-
-  def self.timeout=(timeout)
-    @timeout= timeout
-  end
-
-  def self.timeout
-    @timeout || 0
-  end
+  def self.timeout=(timeout); @timeout= timeout; end
+  def self.timeout; @timeout || 0; end
+  def self.formatter; @formatter ||= Cistern::Formatter::Default; end
+  def self.formatter=(formatter); @formatter = formatter; end
 end

data/spec/cistern_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "inspection engine" do
+  class Inspector < Cistern::Model
+    identity :id
+    attribute :name
+  end
+
+  after(:all) do
+    Cistern.formatter= Cistern::Formatter::Default
+  end
+
+  it "should default to default formatter" do
+    Cistern.formatter.should == Cistern::Formatter::Default
+  end
+
+  it "should use default" do
+    Inspector.new(id: 1, name: "name").inspect.should match /#<Inspector:0x[0-9a-f]+ attributes={id:1,name:\"name\"}/
+  end
+
+  it "should use awesome_print" do
+    defined?(AwesomePrint).should be_false # don't require if not used
+    Cistern.formatter= Cistern::Formatter::AwesomePrint
+
+    Inspector.new(id: 1, name: "name").inspect.match /(?x-mi:\#<Inspector:0x[0-9a-f]+>\ {\n\ \ \ \ \ \ :id\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[1;34m1\x1B\[0m,\n\ \ \ \ :name\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[0;33m"name"\x1B\[0m\n})/
+  end
+
+  it "should use formatador" do
+    defined?(Formatador).should be_false # don't require if not used
+    Cistern.formatter= Cistern::Formatter::Formatador
+
+    Inspector.new(id: 1, name: "name").inspect.should == "  <Inspector\n    id=1,\n    name=\"name\"\n  >"
+  end
+end

data/spec/model_spec.rb

@@ -71,38 +71,9 @@ describe "Cistern::Model" do
     it "should squash and cast" do
       TypeSpec.new({"squash" => {"id" => "12"}}).butternut.should == 12
     end
-  end
-
-  context "inspection engine" do
-    class InspectorSpec < Cistern::Model
-      identity :id
-      attribute :name
-    end
-
-    after(:all) do
-      InspectorSpec.formatter= Cistern::Formatter::Default
-    end
-
-    it "should default to default formatter" do
-      InspectorSpec.formatter.should == Cistern::Formatter::Default
-    end
-
-    it "should use default" do
-      InspectorSpec.new(id: 1, name: "name").inspect.should match /#<InspectorSpec:0x[0-9a-f]+ attributes={id:1,name:\"name\"}/
-    end
-
-    it "should use awesome_print" do
-      defined?(AwesomePrint).should be_false # don't require if not used
-      InspectorSpec.formatter= Cistern::Formatter::AwesomePrint
-
-      InspectorSpec.new(id: 1, name: "name").inspect.match /(?x-mi:\#<InspectorSpec:0x[0-9a-f]+>\ {\n\ \ \ \ \ \ :id\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[1;34m1\x1B\[0m,\n\ \ \ \ :name\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[0;33m"name"\x1B\[0m\n})/
-    end
-
-    it "should use formatador" do
-      defined?(Formatador).should be_false # don't require if not used
-      InspectorSpec.formatter= Cistern::Formatter::Formatador
 
-      InspectorSpec.new(id: 1, name: "name").inspect.should == "  <InspectorSpec\n    id=1,\n    name=\"name\"\n  >"
+    it "should slice out unaccounted for attributes" do
+      TypeSpec.new({"something" => {"id" => "12"}}).attributes.keys.should_not include("something")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -38,6 +38,7 @@ files:
 - lib/cistern/service.rb
 - lib/cistern/version.rb
 - lib/cistern/wait_for.rb
+- spec/cistern_spec.rb
 - spec/collection_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
@@ -66,6 +67,7 @@ signing_key:
 specification_version: 3
 summary: API client framework
 test_files:
+- spec/cistern_spec.rb
 - spec/collection_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb