include_date_scopes 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f330e8d591d974672921057798ad12d098f90a02
-  data.tar.gz: d8783be1a2fe911084a59a83cdbee7f1bea3e1b9
+  metadata.gz: e4b57e4f256f05cb34e6ea7e11c639b293aa7b87
+  data.tar.gz: 8c35adefc851df2c4e37ad8b05f5ed3d4185aede
 SHA512:
-  metadata.gz: 56588927b8a6f4a1c1d56d174fbbe0cd50a40b8105faebbe4dae6479a3cde5b09bf48e1cb6204bd39584c1518e85ac6086b0f56cc9f99af65410347c22de57d5
-  data.tar.gz: 1e166a0ced92168dc5524ce2bcdf78f80b79cc25c574a77eb2c51ab24c14c4b11b20e7131a11b1db9ea218ca05ad8cf948b339b892e35a48fb47cdc94a216746
+  metadata.gz: 744b30ac18ac870e1c951c03c30990186b95ccadcb6d6d743f6748147d6f4ad5952b8f16be64da240a16f8fcdd5ba671242bebfc6b842109231f27712d21d56e
+  data.tar.gz: cf8c6ad8fc127d2267de4260fd1270765458708a84c1c45c8aa482a10d14e67d578acbfffc319f07ae6df777fe07e5dfd36101cc0069116bd1f692b6d2f9f9b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    include_date_scopes (0.9.2)
+    include_date_scopes (0.9.3)
       activerecord (< 4)
       railties
 
@@ -30,17 +30,61 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
+    better_errors (2.0.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     builder (3.0.4)
+    bullet (4.13.2)
+      activesupport (>= 3.0.0)
+      uniform_notifier (>= 1.6.0)
+    byebug (3.4.0)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-ctags-bundler (1.1.0)
+      guard (~> 2.0)
     hike (1.2.3)
+    hitimes (1.2.2)
     i18n (0.6.9)
+    interactive_editor (0.0.10)
+      spoon (>= 0.0.1)
     journey (1.0.4)
     json (1.8.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
     multi_json (1.9.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-mini-profiler (0.9.2)
+      rack (>= 1.1.3)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
@@ -53,6 +97,9 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.2.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec-core (2.14.8)
@@ -67,6 +114,9 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -76,13 +126,23 @@ GEM
     thor (0.19.1)
     tilt (1.4.1)
     timecop (0.7.1)
+    timers (4.0.1)
+      hitimes
     tzinfo (0.3.39)
+    uniform_notifier (1.6.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  better_errors
+  bullet
+  guard-ctags-bundler
   include_date_scopes!
+  interactive_editor
+  pry
+  pry-byebug
+  rack-mini-profiler
   rspec-rails
   sqlite3
   timecop

data/lib/include_date_scopes/date_scopes.rb

@@ -1,3 +1,4 @@
+require 'pry'
 # Add the below date based scopes to a model.
 #
 #   between(start_date_or_time, stop_date_or_time)
@@ -39,13 +40,16 @@ module IncludeDateScopes
 
       def include_date_scopes_for(column,
                                   prepend_name = false,
-                                  column_type = column_type_for(column))
+                                  column_type = nil)
+        column_type ||= column_type_for(column)
         return unless self.table_exists?
         if column_type == :datetime
           define_timestamp_scopes_for column, prepend_name
         elsif column_type == :date
           define_date_scopes_for column, prepend_name
         end
+      rescue
+        warn "Not including date scopes for #{column} because of an error: #{$!.message}"
       end
 
       def include_named_date_scopes_for(column)
@@ -53,7 +57,8 @@ module IncludeDateScopes
       end
 
       def column_type_for(column)
-        self.columns_hash[column.to_s].type
+        # raise "Cannot find column #{column}" unless columns_hash.include? column.to_s
+        columns_hash[column.to_s].type
       end
     end
   end

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.4'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -54,4 +54,16 @@ describe "Post" do
 
     it_behaves_like 'date scopes', :show_at
   end
+
+  describe 'using column which does not exist yet' do
+    it 'does not raise an error' do
+      previous_stderr, $stderr = $stderr, StringIO.new
+      expect {
+        define_model_class do
+          include_date_scopes_for :does_not_exist
+        end
+      }.to_not raise_error
+      $stderr = previous_stderr
+    end
+  end
 end

data/spec/support/timestamp_scope_examples.rb

@@ -107,15 +107,6 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
       include_examples 'between time scope','tomorrow'
     end
 
-    [:second, :minute, :hour, :day, :week, :month, :year].each do |interval|
-      describe ":next_#{interval}" do
-        let(:bottom_threshold) { 1."#{interval}".from_now }
-        let(:top_threshold) { Time.now }
-        let(:arguments) { [] }
-        include_examples 'between time scope',"next_#{interval}"
-      end
-    end
-
     describe ":next_hour" do
       let(:bottom_threshold) { 1.hour.from_now }
       let(:top_threshold) { Time.now }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Sean Todd