cistern 0.1.4 → 0.2.0

data/Gemfile

@@ -8,6 +8,7 @@ group :test do
   gem "guard-rspec"
   gem "rake"
   gem 'rb-fsevent', '~> 0.9.1'
+  gem 'pry-nav'
 end
 
 group :formatters do

data/TODO.md

@@ -0,0 +1,2 @@
+## Cistern::Model
+  * #update would be helpful

data/lib/cistern/attributes.rb

@@ -161,13 +161,7 @@ module Cistern::Attributes
     protected
 
     def missing_attributes(args)
-      missing = []
-      for arg in [:connection] | args
-        unless send("#{arg}") || attributes.has_key?(arg)
-          missing << arg
-        end
-      end
-      missing
+      ([:connection] | args).select{|arg| send("#{arg}").nil?}
     end
   end
 end

data/lib/cistern/collection.rb

@@ -4,9 +4,7 @@ class Cistern::Collection < Array
 
   %w[reject select slice].each do |method|
     define_method(method) do |*args, &block|
-      unless @loaded
-        lazy_load
-      end
+      lazy_load unless @loaded
       data = super(*args, &block)
       self.clone.clear.concat(data)
     end
@@ -14,9 +12,7 @@ class Cistern::Collection < Array
 
   %w[first last].each do |method|
     define_method(method) do
-      unless @loaded
-        lazy_load
-      end
+      lazy_load unless @loaded
       super()
     end
   end
@@ -35,8 +31,7 @@ class Cistern::Collection < Array
   end
 
   def create(attributes={})
-    model = self.new(attributes)
-    model.save
+    self.new(attributes).save
   end
 
   def get(identity)
@@ -59,10 +54,10 @@ class Cistern::Collection < Array
       raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
     end
     model.new(
-      attributes.merge(
+      {
         :collection => self,
-        :connection => connection
-      )
+        :connection => connection,
+      }.merge(attributes)
     )
   end
 
@@ -80,6 +75,11 @@ class Cistern::Collection < Array
     self
   end
 
+  def inspect
+    lazy_load unless @loaded
+    Cistern.formatter.call(self)
+  end
+
   private
 
   def lazy_load

data/lib/cistern/{formatters → formatter}/formatador.rb

@@ -2,6 +2,14 @@ require 'formatador'
 
 module Cistern::Formatter::Formatador
   def self.call(model)
+    case model
+    when Cistern::Collection then collection_inspect(model)
+    when Cistern::Model then model_inspect(model)
+    else model.inspect
+    end
+  end
+
+  def self.model_inspect(model)
     Thread.current[:formatador] ||= Formatador.new
     data = "#{Thread.current[:formatador].indentation}<#{model.class.name}"
     Thread.current[:formatador].indent do
@@ -14,20 +22,20 @@ module Cistern::Formatter::Formatador
     data
   end
 
-  def inspect
+  def self.collection_inspect(collection)
     Thread.current[:formatador] ||= Formatador.new
-    data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"
+    data = "#{Thread.current[:formatador].indentation}<#{collection.class.name}\n"
     Thread.current[:formatador].indent do
-      unless self.class.attributes.empty?
+      unless collection.class.attributes.empty?
         data << "#{Thread.current[:formatador].indentation}"
-        data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
+        data << collection.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
         data << "\n"
       end
       data << "#{Thread.current[:formatador].indentation}["
-      unless self.empty?
+      unless collection.empty?
         data << "\n"
         Thread.current[:formatador].indent do
-          data << self.map {|member| member.inspect}.join(",\n")
+          data << collection.map {|member| member.inspect}.join(",\n")
           data << "\n"
         end
         data << Thread.current[:formatador].indentation

data/lib/cistern/formatter.rb

@@ -1,5 +1,5 @@
 module Cistern::Formatter
-  autoload :AwesomePrint, 'cistern/formatters/awesome_print'
-  autoload :Default, 'cistern/formatters/default'
-  autoload :Formatador, 'cistern/formatters/formatador'
+  autoload :AwesomePrint, 'cistern/formatter/awesome_print'
+  autoload :Default, 'cistern/formatter/default'
+  autoload :Formatador, 'cistern/formatter/formatador'
 end

data/lib/cistern/version.rb

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

data/spec/cistern_spec.rb

@@ -1,34 +1,64 @@
 require 'spec_helper'
 
-describe "inspection engine" do
+describe "#inspect" do
   class Inspector < Cistern::Model
     identity :id
     attribute :name
   end
+  class Inspectors < Cistern::Collection
+    model Inspector
 
-  after(:all) do
-    Cistern.formatter= Cistern::Formatter::Default
+    def all
+      self.load([{id: 1, name: "2"},{id: 3, name: "4"}])
+    end
   end
 
-  it "should default to default formatter" do
-    Cistern.formatter.should == Cistern::Formatter::Default
+  before(:all) do
+    Cistern.formatter = 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
+  describe "Cistern::Model" do
+    it "should use default" do
+      Cistern.formatter = Cistern::Formatter::Default
 
-  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.should match /#<Inspector:0x[0-9a-f]+ attributes={id:1,name:\"name\"}/
+    end
 
-    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 awesome_print" do
+      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
+    it "should use formatador" do
+      Cistern.formatter = Cistern::Formatter::Formatador
+
+      Inspector.new(id: 1, name: "name").inspect.should == %q{  <Inspector
+    id=1,
+    name="name"
+  >}
+    end
+  end
 
-    Inspector.new(id: 1, name: "name").inspect.should == "  <Inspector\n    id=1,\n    name=\"name\"\n  >"
+  describe "Cistern::Collection" do
+    it "should use default" do
+      Inspectors.new.all.inspect.should == %q{  <Inspectors
+    [
+      <Inspector
+        id=1,
+        name="2"
+      >,
+      <Inspector
+        id=3,
+        name="4"
+      >
+    ]
+  >}
+    end
+    it "should use awesome_print" do
+      Cistern.formatter = Cistern::Formatter::AwesomePrint
+      Inspectors.new.all.inspect.should match(/^\[.*\]$/m) # close enough
+    end
+    it "should use formatador"
   end
 end

data/spec/model_spec.rb

@@ -30,6 +30,10 @@ describe "Cistern::Model" do
       attribute :floater, type: :float
       attribute :butternut, type: :integer, aliases: "squash", squash: "id"
       attribute :custom, parser: lambda{|v, opts| "X!#{v}"}
+
+      def save
+        requires :flag
+      end
     end
 
     it "should parse string" do
@@ -75,5 +79,15 @@ describe "Cistern::Model" do
     it "should slice out unaccounted for attributes" do
       TypeSpec.new({"something" => {"id" => "12"}}).attributes.keys.should_not include("something")
     end
+
+    describe "#requires" do
+      it "should raise if attribute not provided" do
+        lambda { TypeSpec.new({"connection" => "fake", "something" => {"id" => "12"}}).save }.should raise_exception(ArgumentError)
+      end
+
+      it "should raise if attribute is provided and is nil" do
+        lambda { TypeSpec.new({"connection" => "fake", "custom" => nil}).save }.should raise_exception(ArgumentError)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -24,14 +24,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - cistern.gemspec
 - lib/cistern.rb
 - lib/cistern/attributes.rb
 - lib/cistern/collection.rb
 - lib/cistern/formatter.rb
-- lib/cistern/formatters/awesome_print.rb
-- lib/cistern/formatters/default.rb
-- lib/cistern/formatters/formatador.rb
+- lib/cistern/formatter/awesome_print.rb
+- lib/cistern/formatter/default.rb
+- lib/cistern/formatter/formatador.rb
 - lib/cistern/hash.rb
 - lib/cistern/mock.rb
 - lib/cistern/model.rb
@@ -49,17 +50,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -71,3 +72,4 @@ test_files:
 - spec/collection_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
+has_rdoc: