microscope 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae239d9a336e0f5dae1eb39800dbf21eecef2d5
-  data.tar.gz: 2afd2fc1a3eaa7dddb9282a1f1a8daee169a8ec9
+  metadata.gz: 1282869f83f7716bed7b98f51ffbf10ac549af20
+  data.tar.gz: ce43d2a660b015851ff0a336f7aa68e3dbe853d4
 SHA512:
-  metadata.gz: 9348ae5d7f3f2bfd6be7b7f4beebe8f1b82fd052ba0ca56df81c7f66dc81825e6281a8153c0628a501be3d91c29cb0003396c5ecf6b0f6c6b5393e1cbe053316
-  data.tar.gz: cbcf09bb50632e1794b7c6095e03e3ef7bb1e7adc97d7538f906cf4e027a59dd9ce1a3e35e1c70e598d285fb813b22b6e1f6a8dcb9556dd6f5fef6d512fb805e
+  metadata.gz: 1aac23cb4ae88a3177eec3a41d2d2a59de034ab8ccea6374293f22e9f286b7c12d89d7adf41e263d8ceb23743d0b81c092bada433415eec66009b1cc7e0b5f78
+  data.tar.gz: b4602d97dde4ce2404e088ec64d7c79890e345f48623510b127e8f5f0f88b85bcc16d17fd392057dfc6c69ca0b4dcf550b830f7509239e13db43ebcf30345226

data/.travis.yml

@@ -18,7 +18,9 @@ before_script:
   - mysql -e 'create database microscope_test;'
   - psql -c 'create database microscope_test;' -U postgres
 
-script: "echo 'DO IT' && bundle exec rake spec"
+script:
+  - 'echo "Checking code style" && bundle exec phare'
+  - 'echo "Running tests" && bundle exec rake spec'
 
 notifications:
   hipchat:

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014, Mirego
+Copyright (c) 2013-2015, Mirego
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -123,7 +123,7 @@ User.updated_before(2.months.ago) # works!
 
 ## License
 
-`Microscope` is © 2013-2014 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/microscope/blob/master/LICENSE.md) file.
+`Microscope` is © 2013-2015 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/microscope/blob/master/LICENSE.md) file.
 
 The microscope logo is based on [this lovely icon](http://thenounproject.com/noun/microscope/#icon-No9056) by [Scott Lewis](http://thenounproject.com/iconify), from The Noun Project. Used under a [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/) license.
 

data/UPGRADE.md

@@ -0,0 +1,37 @@
+## v1.0
+
+Microscope no longer adds instance methods based on the "imperative" grammatical mood.
+
+It now adds the `mark_as_<verb>!` instance method which does the same thing as
+the `mark_as_<verb>` method but then calls `save!` on the record.
+
+```ruby
+# Before 1.0
+class Event < ActiveRecord::Base
+  acts_as_microscope
+end
+
+event = Event.new(started_on: nil)
+
+event.mark_as_started
+event.started_on # => 2015-02-23T07:58:31-0500
+event.reload.started_on # => nil
+
+event.start!
+event.reload.started_on # => 2015-02-23T07:58:31-0500
+
+# After 1.0
+class Event < ActiveRecord::Base
+  acts_as_microscope
+end
+
+event = Event.new(started_on: nil)
+
+event.mark_as_started
+event.started_on # => 2015-02-23T07:58:31-0500
+event.reload.started_on # => nil
+
+event.start! # NoMethodError
+event.mark_as_started!
+event.reload.started_on # => 2015-02-23T07:58:32-0500
+```

data/lib/microscope/instance_method.rb

@@ -1,12 +1,14 @@
 module Microscope
-  class InstanceMethod < Struct.new(:model, :field)
-    def initialize(*args)
-      super
-      @field_name = field.name
+  class InstanceMethod
+    attr_reader :model, :field
+
+    def initialize(model, field)
+      @model = model
+      @field = field
     end
 
     def cropped_field
-      @cropped_field ||= @field_name.gsub(@cropped_field_regex, '')
+      @cropped_field ||= @field.name.gsub(@cropped_field_regex, '')
     end
 
     # Inject ActiveRecord scopes into a model

data/lib/microscope/instance_method/datetime_instance_method.rb

@@ -11,7 +11,7 @@ module Microscope
       def apply
         @cropped_field = field.name.gsub(@cropped_field_regex, '')
 
-        model.class_eval(apply_methods) if @field_name =~ @cropped_field_regex
+        model.class_eval(apply_methods) if @field.name =~ @cropped_field_regex
       end
 
     protected

data/lib/microscope/scope.rb

@@ -1,18 +1,18 @@
 module Microscope
-  class Scope < Struct.new(:model, :field)
-    def initialize(*args)
-      super
+  class Scope
+    attr_reader :model, :field
 
-      @field_name = field.name
-      @table_name = model.name.tableize
+    def initialize(model, field)
+      @model = model
+      @field = field
     end
 
     def quoted_field
-      @quoted_field ||= "#{ActiveRecord::Base.connection.quote_table_name(@table_name)}.#{ActiveRecord::Base.connection.quote_column_name(@field_name)}"
+      @quoted_field ||= "#{ActiveRecord::Base.connection.quote_table_name(@model.table_name)}.#{ActiveRecord::Base.connection.quote_column_name(@field.name)}"
     end
 
     def cropped_field
-      @cropped_field ||= @field_name.gsub(@cropped_field_regex, '')
+      @cropped_field ||= @field.name.gsub(@cropped_field_regex, '')
     end
 
     # Inject ActiveRecord scopes into a model

data/lib/microscope/scope/boolean_scope.rb

@@ -3,9 +3,9 @@ module Microscope
     class BooleanScope < Scope
       def apply
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          scope "#{@field_name}", lambda { where("#{@field_name}" => true) }
-          scope "not_#{@field_name}", lambda { where("#{@field_name}" => false) }
-          scope "un#{@field_name}", lambda { not_#{@field_name} }
+          scope "#{@field.name}", lambda { where("#{@field.name}" => true) }
+          scope "not_#{@field.name}", lambda { where("#{@field.name}" => false) }
+          scope "un#{@field.name}", lambda { not_#{@field.name} }
         RUBY
       end
     end

data/lib/microscope/scope/datetime_scope.rb

@@ -12,7 +12,7 @@ module Microscope
       end
 
       def apply
-        model.class_eval(apply_scopes) if @field_name =~ @cropped_field_regex
+        model.class_eval(apply_scopes) if @field.name =~ @cropped_field_regex
       end
 
     private
@@ -29,7 +29,7 @@ module Microscope
           scope "#{cropped_field}_after#{@now_suffix}", lambda { where('#{quoted_field} > ?', #{@now}) }
           scope "#{cropped_field}_after_or#{@now_suffix}", lambda { where('#{quoted_field} >= ?', #{@now}) }
 
-          scope "#{cropped_field}_between", lambda { |range| where("#{@field_name}" => range) }
+          scope "#{cropped_field}_between", lambda { |range| where("#{@field.name}" => range) }
 
           scope "#{cropped_field}", lambda { where('#{quoted_field} IS NOT NULL AND #{quoted_field} <= ?', #{@now}) }
           scope "not_#{cropped_field}", lambda { where('#{quoted_field} IS NULL OR #{quoted_field} > ?', #{@now}) }

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/microscope.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'mysql2', '~> 0.3.13'
-  spec.add_development_dependency 'rubocop', '~> 0.28'
+  spec.add_development_dependency 'rubocop', '0.29'
   spec.add_development_dependency 'phare'
 end

data/spec/microscope/scope/boolean_scope_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe Microscope::Scope::BooleanScope do
   before do
     run_migration do
-      create_table(:users, force: true) do |t|
+      create_table(:oh_users, force: true) do |t|
         t.boolean :active, default: false
       end
     end
 
-    microscope 'User'
+    microscope 'User' do
+      self.table_name = 'oh_users'
+    end
   end
 
   describe 'positive scope' do

data/spec/support/macros/model_macros.rb

@@ -2,8 +2,8 @@ module ModelMacros
   # Create a new microscope model
   def microscope(klass_name, options = {}, &block)
     spawn_model klass_name, ActiveRecord::Base do
-      acts_as_microscope options
       instance_exec(&block) if block
+      acts_as_microscope options
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Simon Prévost
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,16 +128,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: phare
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- UPGRADE.md
 - gemfiles/Gemfile.activerecord-4.1
 - lib/microscope.rb
 - lib/microscope/instance_method.rb