impressionist 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378fa0c1c197f3f8d61405b0d428030623399fa6
-  data.tar.gz: 6402c5a7b2d24e96508c8a542477a511a177880b
+  metadata.gz: cf5790a21fa67bc75f6e3ee60280da07ed5fd952
+  data.tar.gz: 305395b1c0ed0d7da8609fd2f00de4ccb3e6b6da
 SHA512:
-  metadata.gz: 8975592f31430d6b25c1ce41c1b65a2ba1738393f7994e8279107092f767ecc9d12b52ca9a33db2b720a53d4a649b214ba13284b68b1157a7a42dee3e0ffce28
-  data.tar.gz: 02c8c83a590b7b4c78fc2c20df4cf193dda31951d215be8d0901a03ea4ed7274d1089c715d24fd0eabcfacfcd19d8c221c7ca78a321bb12956190adabd9e5a6c
+  metadata.gz: 654311d3550c7dd71b81936eb1eaa5c86bb667db182639d8ec0b86c94154460e97bd9e8fc1e56f7e19971958edd3b20e19fb222b099d76f727be12827bdddf6d
+  data.tar.gz: 6c967b9fb3e3f47d12b151ab887c352fa1291bfaa331e9dac39602b7c220b383c127c6f3827240d4f44ab552d21ff3cdf879523acbd5a898034956f98f8a5bcf

data/.gitignore

@@ -8,5 +8,6 @@
 /test_app/test
 /test_app/vendor
 Gemfile.lock
+gemfiles/*.lock
 *.swo
 *.swp

data/.travis.yml

@@ -1,21 +1,21 @@
 language: ruby
-
-bundler_args: '--binstubs --without documentation'
-before_install: gem install bundler
-
-before_script: "cd tests/test_app && bundle install && ./script/rails generate impressionist -f && rake db:migrate && cd .."
-
+before_script: 
+  - cd tests/test_app
+  - bundle exec rails g impressionist -f
+  - bundle exec rake db:migrate
+  - cd ..
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
-
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+gemfile:
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
 matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails40.gemfile
   allow_failures:
-      - rvm: rbx-18mode
-      - rvm: 1.8.7
       - rvm: 1.9.2
-      - rvm: ruby-head

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.4.8 (2013-09-01)
+* Fixed #108
+* Clean up
+* (@acnalesso)
+
 == 1.4.7 (2013-08-30)
 * Fixed #103 - Allow impressions to be saved without a Model
 * Fixed #104 - Wrong Documentation

data/app/controllers/impressionist_controller.rb

@@ -38,6 +38,21 @@ module ImpressionistController
       end
     end
 
+    protected
+
+    # creates a statment hash that contains default values for creating an impression via an AR relation.
+    def associative_create_statement(query_params={})
+      query_params.reverse_merge!(
+        :controller_name => controller_name,
+        :action_name => action_name,
+        :user_id => user_id,
+        :request_hash => @impressionist_hash,
+        :session_hash => session_hash,
+        :ip_address => request.remote_ip,
+        :referrer => request.referer
+        )
+    end
+
     private
 
     def bypass
@@ -62,19 +77,6 @@ module ImpressionistController
       end
     end
 
-    # creates a statment hash that contains default values for creating an impression via an AR relation.
-    def associative_create_statement(query_params={})
-      query_params.reverse_merge!(
-        :controller_name => controller_name,
-        :action_name => action_name,
-        :user_id => user_id,
-        :request_hash => @impressionist_hash,
-        :session_hash => session_hash,
-        :ip_address => request.remote_ip,
-        :referrer => request.referer
-        )
-    end
-
     # creates a statment hash that contains default values for creating an impression.
     def direct_create_statement(query_params={})
       query_params.reverse_merge!(

data/gemfiles/rails32.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.2.12'
+gem 'jquery-rails'
+gem 'json'
+
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+gem 'jdbc-sqlite3', :platforms => [:jruby]
+
+gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+
+gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.0.0'
+gem 'jquery-rails'
+gem 'json'
+
+gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.rc1', :platforms => [:jruby]
+
+gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+
+gemspec :path => '../'

data/impressionist.gemspec

@@ -20,17 +20,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'httpclient', '~> 2.2'
 
-  # Nokogiri has dropped support for Ruby 1.8.7 onwards version 1.5.10
-  s.add_dependency 'nokogiri', (RUBY_VERSION.match("1.8.7") ? '1.5.10' : '~> 1.6.0')
+  s.add_dependency 'nokogiri', '~> 1.6.0'
 
-  # Capybara has dropped support for Ruby 1.8.7 onwards version 2.0.3
   s.add_development_dependency 'capybara', '>= 2.0.3'
   s.add_development_dependency 'rake', '>= 0.9'
-  s.add_development_dependency 'rails', '3.2.12'
+  s.add_development_dependency 'rails', '>= 3.2.12', '< 4.1'
   s.add_development_dependency 'rdoc', '>= 2.4.2'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'systemu'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-rails'

data/lib/impressionist/models/mongoid/impressionist/impressionable.rb

@@ -9,10 +9,23 @@ module Impressionist
     # Overides impressionist_count in order to provied
     # mongoid compability
     def impressionist_count(options={})
-      options.reverse_merge!(:filter=>:request_hash, :start_date=>nil, :end_date=>Time.now)
-      imps = options[:start_date].blank? ? impressions : impressions.between(created_at: options[:start_date]..options[:end_date])
+      options.
+      reverse_merge!(
+        :filter=>:request_hash,
+        :start_date=>nil,
+        :end_date=>Time.now)
+
+      imps = options[:start_date].blank?
+        ? impressions :
+        impressions.
+          between(created_at: options[:start_date]..options[:end_date])
+
       filter = options[:filter]
-      filter == :all ? imps.count : imps.where(filter.ne => nil).distinct(filter).count
+
+      filter == :all ?
+        imps.count :
+        imps.where(filter.ne => nil).
+          distinct(filter).count
     end
 
   end

data/lib/impressionist/rails_toggle.rb

@@ -1,20 +1,24 @@
 module Impressionist
-  # Responsability
+  # Responsibility
   # Toggles between rails > 3.1 < 4
   # In order to make attr_accessible available in a rails app < 4
 
   class RailsToggle
     # decides where or not to include attr_accessible
     def should_include?
-      ask_rails || false
+      supported_by_rails? && (not using_strong_parameters?)
     end
 
     private
 
+      def using_strong_parameters?
+        defined?(StrongParameters)
+      end
+
       # returns false if rails >= 4
       # true if rails < 4
-      def ask_rails
-        ::Rails::VERSION::MAJOR.to_i >= 4 ? false : true
+      def supported_by_rails?
+        ::Rails::VERSION::MAJOR.to_i < 4
       end
 
   end

data/lib/impressionist/version.rb

@@ -1,3 +1,3 @@
 module Impressionist
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end

data/tests/spec/rails_toggle_spec.rb

@@ -15,12 +15,24 @@ module Impressionist
 
       # see your_minitest_path/lib/minitest/mock.rb
       it "must not include attr_accessible" do
-        @toggle.stub :ask_rails, false do
+        @toggle.stub :supported_by_rails?, false do
           refute @toggle.should_include?
         end
       end
 
     end
 
+    describe "Strong Parameters" do
+
+      # see your_minitest_path/lib/minitest/mock.rb
+      it "must not include attr_accessible" do
+        @toggle.stub :supported_by_rails?, true do
+          @toggle.stub :using_strong_parameters?, true do
+            refute @toggle.should_include?
+          end
+        end
+      end
+
+    end
   end
 end

data/tests/spec/setup_association_spec.rb

@@ -44,7 +44,7 @@ module Impressionist
         def set_up.include_attr_acc?; true; end
 
         set_up.stub(:define_belongs_to, true) {
-          set_up.set.must_equal :done
+          set_up.set.must_equal true
         }
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impressionist
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - johnmcaliley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -70,16 +70,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +128,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +188,8 @@ files:
 - app/models/impression.rb
 - app/models/impressionist/bots.rb
 - app/models/impressionist/impressionable.rb
+- gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
 - impressionist.gemspec
 - lib/generators/active_record/impressionist_generator.rb
 - lib/generators/active_record/templates/create_impressions_table.rb