sir_trevor_rails 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a17365d69117d59bd658fb0da6a53f491c2cfde4
-  data.tar.gz: 10245b86003a4e821bd35e55d99d3083c7ccf062
+SHA256:
+  metadata.gz: 0a1c2cf1f3e25b93298e404ad2cf3ff350c6ca6668414e80eda23a6addb2848f
+  data.tar.gz: 16be7ad703a0dc2a80591db4d56674b0ce42a6b776d0aaa129a113ed244e20be
 SHA512:
-  metadata.gz: fad85e8fe836fa24329d8cb838852c6e225449b84618cc552c705d70a9777c8eded15e9d8004ce6c6b1db6d8caaa24a9b2cab315b213a8cfb44cf974d1df5353
-  data.tar.gz: b327975f26172138c53a74fcb07077085858f3e353719f8cd52679039404296cf7875483da612297d6aa67a98da77ce57cec87a103f847c5cf639877bed4b01c
+  metadata.gz: 3e1463ab7d9fd6391847c59f0c55750c77bea92aff5f1f6243826bf3dd61bb8602ccafea476498693a51eb35f42ea96bdf5173bf4f34620130d317bf8464e70c
+  data.tar.gz: b6a1c1bf4ab98089114180645f0221e12a8cba880a08375e4736b39ca06e9f346ec4c746a8a973d69631535f5310162a66781add2f9940b8d2e1090e77122fdf

data/.travis.yml

@@ -5,5 +5,6 @@ rvm:
   - 2.1.0
   - 2.2.5
   - 2.3.1
+  - 2.6.5
 
 script: 'bundle exec rake test'

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.6.1:
+	date: 2020-02-12
+		- Rails 6 support
+v0.6.0:
+  date: 2019-02-19
+    - Added custom_block_types to improve block class lookup performance 
+
 v0.4.0:
 	date: 2014-05-20
 	changes:

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 if RUBY_VERSION < '2.2'
   gem 'rack', '< 2'
   gem 'rails', '< 5'
+  gem 'sqlite3', '~> 1.3.0'
 end

data/README.md

@@ -1,6 +1,23 @@
 # Sir Trevor Rails
 
-A Rails gem for integrating Sir Trevor JS into your Rails 3/4 application.
+A Rails gem for integrating Sir Trevor JS into your Rails 3/4/5/6 application.
+
+## Upgrade guide to v0.6.0
+
+There is a breaking change which needs to be applied if you've defined custom ruby blocks.
+
+Create an initializer ``config/initializers/sir_trevor_rails.rb``
+
+Add your custom block types in the initializer:
+
+```ruby
+class SirTrevorRails::Block
+  def self.custom_block_types
+    # Type should be string based and prefix of your class name.
+    ["Custom"] # Would relate to CustomBlock
+  end
+end
+```
 
 ## Upgrade guide from v0.4.0-rc.1
 
@@ -74,6 +91,22 @@ Does this content have an image block?
 
 Return the first video block in the content
 
+## Add custom block types with custom methods
+
+Create an initializer ``config/initializers/sir_trevor_rails.rb``
+
+Add your custom block types in the initializer:
+
+```ruby
+class SirTrevorRails::Block
+  def self.custom_block_types
+    # Type should be string based and prefix of your class name which would be for the following.
+    # TextBlock, HeadingBlock, CustomBlock
+    ["Text", "Heading", "Custom"]
+  end
+end
+```
+
 ## Add custom methods for block content
 
 Create an initializer ``config/initializers/sir_trevor_rails.rb``
@@ -110,8 +143,7 @@ Ruby block classes can be used like decorators for the block content. See the [t
 
 ## Requirements
 
-
-- Rails 3.x/4.x
+- Rails 3.x/4.x/5.x/6.x
 
 ## To do
 

data/lib/sir_trevor_rails/block.rb

@@ -13,6 +13,11 @@ module SirTrevorRails
       send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
     end
 
+    # Sets a list of custom block types to speed up lookup at runtime.
+    def self.custom_block_types
+      []
+    end
+
     def initialize(hash, parent)
       @raw_data = hash
       @parent  = parent
@@ -40,10 +45,15 @@ module SirTrevorRails
     #
     # @param [Symbol] type
     def self.block_class(type)
-      block_name = "#{type.to_s.camelize}Block"
-      begin
-        block_name.constantize
-      rescue NameError
+      type_name = type.to_s.camelize
+      block_name = "#{type_name}Block"
+      if custom_block_types.include?(type_name)
+        begin
+          block_name.constantize
+        rescue NameError
+          block_class!(block_name)
+        end
+      else
         block_class!(block_name)
       end
     end

data/lib/sir_trevor_rails/block_array.rb

@@ -29,5 +29,10 @@ module SirTrevorRails
       klass = Block.block_class(type)
       detect { |b| b.is_a? klass }
     end
+
+    def get_blocks_of_types(types)
+      types = [types] unless types.is_a? Array
+      select { |b| types.include?(b.type) }
+    end
   end
 end

data/lib/sir_trevor_rails/version.rb

@@ -1,3 +1,3 @@
 module SirTrevorRails
-  VERSION = "0.5.1"
+  VERSION = "0.6.1"
 end

data/sir_trevor_rails.gemspec

@@ -24,17 +24,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.4"
+  spec.add_development_dependency "bundler", ">= 1.4"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.3"
   spec.add_development_dependency "wrong"
   spec.add_development_dependency "pry-rails"
-  spec.add_development_dependency "combustion"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "combustion", "~> 1.1"
+  spec.add_development_dependency "sqlite3", ">= 1.3", "< 1.5"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "launchy"
 
-  spec.add_dependency "rails", ">= 3", "< 6"
+  spec.add_dependency "rails", ">= 3", "< 7"
   spec.add_dependency "redcarpet", ">= 2.0.1", "< 4"
   spec.add_dependency "twitter-text", "~> 1.4"
   spec.add_dependency 'multi_json', '~> 1.0'

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
 require 'sir_trevor_rails'
+require 'bundler'
+
+Bundler.require :default, :development
+
 require 'combustion'
 
 Combustion.initialize! :active_record, :action_view do

data/spec/unit/block_array_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class BlockArraySpec < ActiveSupport::TestCase
   describe BlockArray do
-    describe 'intialization' do
+    describe 'initialization' do
       subject { BlockArray }
 
       it 'can be initialized with an empty JSON array' do
@@ -65,6 +65,25 @@ class BlockArraySpec < ActiveSupport::TestCase
         end
       end
 
+      describe 'get_blocks_of_types' do
+        it 'returns all blocks of given types in the array' do
+          text_blocks = subject.get_blocks_of_types(:text)
+          text_blocks.each do |b| 
+            assert { b.type == :text }
+          end
+        end
+
+        it 'returns correct number of blocks of given types in the array' do
+          text_blocks = subject.get_blocks_of_types([:text, :list])
+          assert { text_blocks.size == 2 }
+        end
+
+        it 'returns empty array if called with block type not in the array' do
+          nonexistent_blocks = subject.get_blocks_of_types(:nonexistent)
+          assert { nonexistent_blocks.size == 0 }
+        end
+      end
+
       describe 'to_a' do
         it 'returns array with same number of elements' do
           assert { subject.to_a.class == Array }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sir_trevor_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Sprinz
@@ -11,20 +11,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -87,30 +87,36 @@ dependencies:
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +154,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -158,7 +164,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -301,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for sir trevor content
@@ -338,4 +343,3 @@ test_files:
 - spec/unit/custom_block_spec.rb
 - spec/unit/has_sir_trevor_content_spec.rb
 - spec/unit/helpers_spec.rb
-has_rdoc: