bit_core 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720c15056ce284cef90e3a0da4de5e4a49facadc
-  data.tar.gz: 96ac706ae8a7643791f9310e5a940f9e3fbe3893
+  metadata.gz: ca1dff08831343bb3c24fd66207082497817a71b
+  data.tar.gz: f1786b5914c92a36970fde58843ee3db09d433c5
 SHA512:
-  metadata.gz: c7c06eda74f9facea4759c38653d8d6a731da64ad9c056e2f73fcb99f889a7f16e1bf6cb256b7bfb151a1565768955a7a9bb8ca02b18acd067a2bd4fc1a9a1ef
-  data.tar.gz: 87044fdf380eec58f6e1169d381a00c4c93d7286af38d86cce5cb6adc09a56bcaca9cb7c49482f8dac00fbcc2210a8c68afdd0bd6724ae98f94815e2390d4459
+  metadata.gz: 403a490583533d46c4519396607474cc4be15d0328ae37aa5c415f5c50ad7e7daeef09653fd9f9955c5539dfbc4837002c14c71b5a68ff7ce6e324f66e7d0ae3
+  data.tar.gz: 0aa6a99a0f53fa4ff68fcc8d0e33c04fc8043b5328904bda11bc9165000ae20e847067ec3607c60535e0a73bd5d55b62490ac6efbce096e687688c8786f54adf

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require "bundler/setup"
 rescue LoadError
@@ -10,7 +11,17 @@ load "rails/tasks/engine.rake"
 
 Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), "tasks/**/*.rake")].each {|f| load f }
+Dir[File.join(File.dirname(__FILE__), "tasks/**/*.rake")].each { |f| load f }
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+desc "Run Brakeman"
+task :brakeman do
+  dir = File.dirname(__FILE__)
+  puts `#{ File.join(dir, "bin", "brakeman") } #{ File.join(dir, ".") }`
+end
 
 require "rspec/core"
 require "rspec/core/rake_task"
@@ -18,4 +29,8 @@ require "rspec/core/rake_task"
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task :default do
+  Rake::Task["rubocop"].invoke
+  Rake::Task["brakeman"].invoke
+  Rake::Task["spec"].invoke
+end

data/app/models/bit_core/audio_slide.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module BitCore
   # A Slide with audio content.
   class AudioSlide < Slide
-    serialize :options
   end
 end

data/app/models/bit_core/content_module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   # A logical unit of content, possibly containing mixed provider types.
   class ContentModule < ActiveRecord::Base
@@ -18,7 +19,7 @@ module BitCore
     # Returns the `ContentProvider` at the given position, or a `Null`
     # `ContentProvider` if none exists.
     def provider(position)
-      content_providers.where(position: position).first ||
+      content_providers.find_by(position: position) ||
         ContentProviders::Null.new(self, position)
     end
 

data/app/models/bit_core/content_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   # Modeled after the presenter pattern. Ties data layer to view layer.
   class ContentProvider < ActiveRecord::Base
@@ -43,7 +44,7 @@ module BitCore
     # Returns a human readable string extracted from the ContentProvider class
     # name.
     def pretty_label
-      self.class.to_s.split("::").last.underscore.gsub(/_/, " ")
+      self.class.to_s.split("::").last.underscore.tr("_", " ")
     end
 
     private
@@ -52,14 +53,14 @@ module BitCore
       path = File.join(Rails.root, "app", "views", template_path || "")
       return if Dir.exist?(path)
 
-      errors.add(:template_path, "not found at #{ path }")
+      errors.add(:template_path, "not found at #{path}")
     end
 
     def data_class_exists
       return unless data_class_name && !data_class
 
       errors.add(:data_class_name,
-                 "unable to find class '#{ data_class_name }'")
+                 "unable to find class '#{data_class_name}'")
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -72,7 +73,7 @@ module BitCore
       return if unknown_attrs.count == 0
 
       errors.add(:data_attributes, "must be attributes on the model class " \
-                 "(unrecognized: #{ unknown_attrs.join(', ') })")
+                 "(unrecognized: #{unknown_attrs.join(', ')})")
     end
     # rubocop:enable Metrics/AbcSize
   end

data/app/models/bit_core/content_providers/null.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   module ContentProviders
     # The default provider.
@@ -10,7 +11,7 @@ module BitCore
       end
 
       def render_current(_options)
-        "Content Module #{ @content_module.title }: Oops, did you expect a
+        "Content Module #{@content_module.title}: Oops, did you expect a
         content provider here?"
       end
 

data/app/models/bit_core/content_providers/slideshow_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   module ContentProviders
     # Defines presentation logic for a Slideshow.
@@ -16,7 +17,7 @@ module BitCore
       end
 
       def slide(position)
-        slideshow.slides.where(position: position).first ||
+        slideshow.slides.find_by(position: position) ||
           BitCore::Slide.new(body: "no slides")
       end
 

data/app/models/bit_core/slide.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "redcarpet"
 
 module BitCore
@@ -12,8 +13,11 @@ module BitCore
     validates :position, numericality: { greater_than_or_equal_to: 1 }
     validates :position, uniqueness: { scope: :bit_core_slideshow_id }
 
+    before_validation :normalize_options
     after_destroy :update_slide_positions
 
+    serialize :options
+
     def render_body
       return "" if body.nil?
 
@@ -28,9 +32,13 @@ module BitCore
 
     private
 
+    def normalize_options
+      self.options = options.try(:to_h)
+    end
+
     def update_slide_positions
       slideshow.reload
-        .sort(slideshow.slide_ids)
+               .sort(slideshow.slide_ids)
     end
   end
 end

data/app/models/bit_core/slideshow.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "redcarpet"
 
 module BitCore

data/app/models/bit_core/tool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   # A section of an application.
   class Tool < ActiveRecord::Base

data/app/models/bit_core/video_slide.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module BitCore
   # A Slide with video content.
   class VideoSlide < Slide
-    serialize :options
   end
 end

data/lib/bit_core/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitCore
   # Mountable engine with isolated namespace.
   class Engine < ::Rails::Engine

data/lib/bit_core/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 # nodoc
 module BitCore
-  VERSION = "2.0.0.beta1"
+  VERSION = "2.0.0.beta2"
 end

data/lib/bit_core.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bit_core/engine"
 
 # nodoc

data/lib/tasks/bit_core_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :bit_core do
 #   # Task goes here