searchjoy 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862d1746537799a5bafb78e34d80cada1c14de5c
-  data.tar.gz: 83fbc177bc299282edae186d4147cf285d7ad4fe
+  metadata.gz: 3bf6ba548fc593244ad33e8730d462eb32782e1b
+  data.tar.gz: 8368c14bf4f4edbaca26a5ceadd56c02cf8d0aba
 SHA512:
-  metadata.gz: '097becc8c6b70f079d66a5687c0db5fb7bc0ada6be6cf47ef2d33246d4ee908293dedcc62dd4ef37081e268fb8f94284c61c58b146e07b89cfa55a5ea6e2b579'
-  data.tar.gz: f13fa9f9cdd05d088fd5eacb72ca466eaa387927fe159276d2d4705d54d19e324c8986666b5aa9f4b080e0cf9b8c7e6b8ee9d30d79cdb6bf96b0c418351276d9
+  metadata.gz: fbe4a0101a7e8537dce6e7fac53082cb904c088691249476ecc7862fccb91a7f7e4f96a64492f3886b20dd12e614331ca20ce6033646f8c558f9fc07bd813c2d
+  data.tar.gz: e3f4b7080eb8076fab111a7c1f0001e5ea03cf904a5edc0ffc32becf9efb730e50d43bfdbfaf0eba1cda007f4ebc65dacc8784aa59a220deeab8ddd5fba06a96

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0
+
+- Added support for Rails 5.1
+- Fixed `belongs_to` issue with Rails 5
+
 ## 0.2.1
 
 - Added `query_url` option

data/app/models/searchjoy/search.rb

@@ -1,6 +1,10 @@
 module Searchjoy
   class Search < ActiveRecord::Base
-    belongs_to :convertable, polymorphic: true
+    if Rails::VERSION::MAJOR == 5
+      belongs_to :convertable, polymorphic: true, optional: true
+    else
+      belongs_to :convertable, polymorphic: true
+    end
 
     # the devise way
     if (Rails::VERSION::MAJOR == 3 && !defined?(ActionController::StrongParameters)) || defined?(ActiveModel::MassAssignmentSecurity)

data/lib/generators/searchjoy/install_generator.rb

@@ -22,7 +22,13 @@ module Searchjoy
       end
 
       def copy_migration
-        migration_template "install.rb", "db/migrate/install_searchjoy.rb"
+        migration_template "install.rb", "db/migrate/install_searchjoy.rb", migration_version: migration_version
+      end
+
+      def migration_version
+        if ActiveRecord::VERSION::MAJOR >= 5
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
       end
     end
   end

data/lib/generators/searchjoy/templates/install.rb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :searchjoy_searches do |t|
       t.integer :user_id

data/lib/searchjoy/version.rb

@@ -1,3 +1,3 @@
 module Searchjoy
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchjoy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Search analytics made easy