tempo-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce2d1ab18d47aece23c6034eb43e2c668fcb207c
-  data.tar.gz: 7a6d372bb3e12ef63730bed5cac7a30be19a73f8
+  metadata.gz: 7e0e749497d74a2c5e925fd047c19040e672ec24
+  data.tar.gz: a4923005458055bcf4439e939a8f278d65459296
 SHA512:
-  metadata.gz: 2706c79ae90158751b2059067e887d9ee65e672fcaeacf777b58a698a340dc8c1ecfeba11f730e7d1b56732c5056800c3644afaaa3ef5eeaf06d566cbfd26420
-  data.tar.gz: 3acd0dc7d1ee0d3f7a84439b2eb995d9f31ca81e325e012f493439ba2c4c0f58c489eedd61a508ff96575a478b8805aeae3a2deb83586bf44aedb348f7d782aa
+  metadata.gz: 2524f53d37306e60ced9e55015ac57c1e962540113170b190abb7937a7a2eb16dd0ef7d5825d9ac574895649df0b0f49d3fe146e64a75c9800c51dc42a30aaa3
+  data.tar.gz: 66e4108bba0f37681e7a1f4e701f5e3a7de62705770351f9e5954e998351a73f85328e4e20bdf06ba392905b45c60f4b638051a9fe5aa0c417629f1509016b78

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    tempo-cli (0.1.6)
-      chronic (~> 0.10.2)
-      gli (~> 2.10.0)
+    tempo-cli (0.2.1)
+      chronic (~> 0.10)
+      gli (~> 2.10)
 
 GEM
   remote: https://rubygems.org/
@@ -27,16 +27,16 @@ GEM
     ffi (1.9.0)
     gherkin (2.12.0)
       multi_json (~> 1.3)
-    gli (2.10.0)
-    json (1.8.0)
+    gli (2.11.0)
+    json (1.8.1)
     method_source (0.8.1)
     multi_json (1.7.7)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -48,9 +48,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  pry (~> 0.9.12.2)
-  rake
-  rdoc
+  aruba (~> 0.5)
+  pry (~> 0.9)
+  rake (~> 10.3)
+  rdoc (~> 4.1)
   tempo-cli!
-  turn (~> 0.9.6)
+  turn (~> 0.9)

data/bin/tempo

@@ -487,7 +487,7 @@ on_error do |exception|
   # return false to skip default error handling
 
   # remove before distribution:
-  #puts exception.backtrace
+  # puts exception.backtrace
 
   true
 end

data/lib/tempo/models/base.rb

@@ -52,17 +52,43 @@ module Tempo
         end
 
         def method_missing(meth, *args, &block)
+          if respond_to? meth
+            if meth.to_s =~ /^find_by_(.+)$/
+              self.class.send(:define_method, meth) do |*args|
+                run_find_by_method($1, *args)
+              end
+              self.send(meth, *args)
 
-          if meth.to_s =~ /^find_by_(.+)$/
-            run_find_by_method($1, *args, &block)
+            elsif meth.to_s =~ /^sort_by_(.+)$/
+              self.class.send(:define_method, meth) do |*args, &block|
+                run_sort_by_method($1, *args, &block)
+              end
+              self.send(meth, *args, &block)
 
-          elsif meth.to_s =~ /^sort_by_(.+)$/
-            run_sort_by_method($1, *args, &block)
+            else
+              super
+            end
           else
             super
           end
         end
 
+        def respond_to?(method_id, include_private = false)
+          if method_id.to_s =~ /^find_by_(.+)$/ || method_id.to_s =~ /^sort_by_(.+)$/
+            instances_have_attributes? $1.split('_and_')
+          else
+            super
+          end
+        end
+
+        def instances_have_attributes?(attrs)
+            finder_attrs = attrs.map { |key| "@#{key}".to_sym }
+            model_attrs = index.map { |i| i.instance_variables }.flatten.uniq
+
+            # Make sure all attributes are present in index objects
+            (model_attrs & finder_attrs).size == finder_attrs.size
+        end
+
         def run_sort_by_method(attribute, args=@index.clone, &block)
           attr = "@#{attribute}".to_sym
           args.sort! { |a,b| a.instance_variable_get( attr ) <=> b.instance_variable_get( attr ) }
@@ -70,7 +96,7 @@ module Tempo
           block.call args
         end
 
-        def run_find_by_method(attrs, *args, &block)
+        def run_find_by_method(attrs, *args)
           # Make an array of attribute names
           attrs = attrs.split('_and_')
 

data/lib/tempo/models/project.rb

@@ -22,8 +22,12 @@ module Tempo
         end
 
         def include?(title)
+
+          return false if index.empty?
+
           matches = find_by_title(title)
           return false if matches.empty?
+
           matches.each do |match|
             return true if match.title == title
           end

data/lib/tempo/version.rb

@@ -1,3 +1,3 @@
 module Tempo
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/lib/tempo/models/base_test.rb

@@ -1,5 +1,19 @@
 require "test_helper"
 
+# Used to test define_method is called
+# the first time a find_by_ and sort_by_
+# is called. Don't use for any other tests
+class Plant < Tempo::Model::Base
+  attr_accessor :stem, :leaf
+
+  def initialize( options={} )
+    super options
+    @stem = options.fetch(:stem, "woody")
+    @leaf = options.fetch(:leaf, "broad")
+  end
+end
+
+
 describe Tempo do
 
   before do
@@ -8,6 +22,11 @@ describe Tempo do
     Dir.mkdir(@dir, 0700) unless File.exists?(@dir)
   end
 
+  def after_teardown
+    Tempo::Model::Animal.clear_all
+    super
+  end
+
   describe "Model::Base" do
 
     it "is inheritable from" do
@@ -127,10 +146,6 @@ describe Tempo do
       search = Tempo::Model::Animal.find_by_species("Versicolor")
       search.must_equal [ @gray_tree_frog ]
 
-      # # test, does this work, and should it?
-      # search = Tempo::Model::Animal.find_by_species("h. color")
-      # search.must_equal [ @gray_tree_frog ]
-
       search = Tempo::Model::Animal.find_by_genious("hyla")
       search.length.must_equal 5
 
@@ -138,6 +153,26 @@ describe Tempo do
       search.must_equal [ @gray_tree_frog ]
     end
 
+    it "responds to find_by_ method" do
+      # Current behavior raises error if no instances exist.
+      # This behavior could be relaxed, or models could be made
+      # to explicity declare findable attributes
+      frog_factory
+      Tempo::Model::Animal.must_respond_to :find_by_species
+    end
+
+    it "doesn't respond to find_by_ method for non-existent attribute" do
+      Tempo::Model::Animal.wont_respond_to :find_by_blah
+      proc { Tempo::Model::Animal.find_by_blah 1 }.must_raise NoMethodError
+    end
+
+    it "defines find_by_ methods after first call" do
+      plant = Plant.new
+      Plant.methods.include?(:find_by_stem).must_equal false
+      Plant.find_by_stem("woody")
+      Plant.methods.include?(:find_by_stem).must_equal true
+    end
+
     it "has a sort_by_ method" do
       frog_factory
       list = Tempo::Model::Animal.sort_by_species [ @gray_tree_frog, @pine_barrens_tree_frog ]
@@ -160,6 +195,26 @@ describe Tempo do
       list.must_equal "h. andersonii, h. avivoca, h. chinensis, h. chrysoscelis, h. versicolor"
     end
 
+    it "responds to sort_by_ method" do
+      # Current behavior raises error if no instances exist.
+      # This behavior could be relaxed, or models could be made
+      # to explicity declare sortable attributes
+      frog_factory
+      Tempo::Model::Animal.must_respond_to :sort_by_species
+    end
+
+    it "doesn't respond to sort_by_ method for non-existent attribute" do
+      Tempo::Model::Animal.wont_respond_to :sort_by_blah
+      proc { Tempo::Model::Animal.sort_by_blah }.must_raise NoMethodError
+    end
+
+    it "defines sort_by methods after first call" do
+      plant = Plant.new
+      Plant.methods.include?(:sort_by_stem).must_equal false
+      Plant.sort_by_stem
+      Plant.methods.include?(:sort_by_stem).must_equal true
+    end
+
     it "has a method_missing method" do
       proc { Tempo::Model::Animal.foo }.must_raise NoMethodError
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonathan Gabel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake