bit_player 0.3.0 → 0.4.0

data/spec/fixtures/bit_player/content_providers.yml

@@ -2,10 +2,8 @@ home_landing_slideshow:
   content_module: home_landing
   position: 1
   type: BitPlayer::ContentProviders::SlideshowProvider
-  #source_content: home_intro (BitPlayer::Slideshow)
 
 home_module_2_slideshow:
   content_module: home_module_2
   position: 1
   type: BitPlayer::ContentProviders::SlideshowProvider
-  #source_content: home_intro (BitPlayer::Slideshow)

data/spec/models/bit_player/navigator_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "bit_core"
 
 describe BitPlayer::Navigator do
   let(:status) do
@@ -16,7 +17,7 @@ describe BitPlayer::Navigator do
   let(:nav) { BitPlayer::Navigator.new(participant) }
 
   before do
-    expect(BitPlayer::Tool).to receive(:find_by_title)
+    expect(BitCore::Tool).to receive(:find_by_title)
       .and_return(double("tool", id: 1))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bit_player
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: bit_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -93,18 +107,10 @@ files:
 - app/assets/javascripts/bit_player/application.js
 - app/assets/stylesheets/bit_player/application.css
 - app/controllers/bit_player/application_controller.rb
-- app/models/bit_player/content_module.rb
-- app/models/bit_player/content_provider.rb
 - app/models/bit_player/content_providers/form_view_provider.rb
-- app/models/bit_player/content_providers/null.rb
-- app/models/bit_player/content_providers/slideshow_provider.rb
 - app/models/bit_player/content_providers/view_provider.rb
 - app/models/bit_player/navigator.rb
 - app/models/bit_player/participant_status.rb
-- app/models/bit_player/slide.rb
-- app/models/bit_player/slideshow.rb
-- app/models/bit_player/tool.rb
-- app/models/bit_player/video_slide.rb
 - app/views/layouts/bit_player/application.html.erb
 - config/routes.rb
 - db/migrate/20140305200438_create_bit_player_content_modules.rb
@@ -113,8 +119,8 @@ files:
 - db/migrate/20140305232706_create_bit_player_slideshows.rb
 - db/migrate/20140305234327_create_bit_player_slides.rb
 - db/migrate/20140402224913_create_bit_player_tools.rb
-- db/migrate/20140402225703_change_module_context_to_tool.rb
-- db/migrate/20140619200219_add_config_fields_to_providers.rb
+- db/migrate/20140620182756_convert_slides_slideshows_to_bit_core.rb
+- db/migrate/20140620222851_convert_tools_modules_presenters_to_bit_core.rb
 - lib/bit_player.rb
 - lib/bit_player/engine.rb
 - lib/bit_player/version.rb
@@ -145,6 +151,13 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20140620222614_create_bit_core_tools.bit_core.rb
+- spec/dummy/db/migrate/20140620222615_create_bit_core_content_modules.bit_core.rb
+- spec/dummy/db/migrate/20140620222616_create_bit_core_content_providers.bit_core.rb
+- spec/dummy/db/migrate/20140620222617_create_bit_core_slideshows.bit_core.rb
+- spec/dummy/db/migrate/20140620222618_create_bit_core_slides.bit_core.rb
+- spec/dummy/db/migrate/20140620222619_add_options_to_slides.bit_core.rb
+- spec/dummy/db/migrate/20140620222620_add_config_fields_to_providers.bit_core.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
@@ -154,14 +167,9 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/fixtures/bit_player/content_modules.yml
 - spec/fixtures/bit_player/content_providers.yml
-- spec/fixtures/bit_player/slides.yml
-- spec/fixtures/bit_player/slideshows.yml
 - spec/fixtures/bit_player/tools.yml
-- spec/models/bit_player/content_module_spec.rb
-- spec/models/bit_player/content_provider_spec.rb
 - spec/models/bit_player/content_providers/view_provider_spec.rb
 - spec/models/bit_player/navigator_spec.rb
-- spec/models/bit_player/slide_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/nupmmarkbegale/bit_player
 licenses: []
@@ -212,6 +220,13 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/migrate/20140620222614_create_bit_core_tools.bit_core.rb
+- spec/dummy/db/migrate/20140620222615_create_bit_core_content_modules.bit_core.rb
+- spec/dummy/db/migrate/20140620222616_create_bit_core_content_providers.bit_core.rb
+- spec/dummy/db/migrate/20140620222617_create_bit_core_slideshows.bit_core.rb
+- spec/dummy/db/migrate/20140620222618_create_bit_core_slides.bit_core.rb
+- spec/dummy/db/migrate/20140620222619_add_options_to_slides.bit_core.rb
+- spec/dummy/db/migrate/20140620222620_add_config_fields_to_providers.bit_core.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
@@ -223,12 +238,7 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/fixtures/bit_player/content_modules.yml
 - spec/fixtures/bit_player/content_providers.yml
-- spec/fixtures/bit_player/slides.yml
-- spec/fixtures/bit_player/slideshows.yml
 - spec/fixtures/bit_player/tools.yml
-- spec/models/bit_player/content_module_spec.rb
-- spec/models/bit_player/content_provider_spec.rb
 - spec/models/bit_player/content_providers/view_provider_spec.rb
 - spec/models/bit_player/navigator_spec.rb
-- spec/models/bit_player/slide_spec.rb
 - spec/spec_helper.rb

data/app/models/bit_player/content_module.rb

@@ -1,36 +0,0 @@
-module BitPlayer
-  # A logical unit of content, possibly containing mixed provider types.
-  class ContentModule < ActiveRecord::Base
-    belongs_to :tool,
-               class_name: "BitPlayer::Tool",
-               foreign_key: :bit_player_tool_id
-    has_many :content_providers,
-             class_name: "BitPlayer::ContentProvider",
-             foreign_key: :bit_player_content_module_id,
-             inverse_of: :content_module,
-             dependent: :destroy
-
-    validates :title, :tool, :position, presence: true
-    validates :position, numericality: { greater_than_or_equal_to: 1 }
-    validates :position, uniqueness: { scope: :bit_player_tool_id }
-
-    def provider(position)
-      content_providers.where(position: position).first ||
-        ContentProviders::Null.new(self, position)
-    end
-
-    def provider_exists?(position)
-      content_providers.exists?(position: position)
-    end
-
-    def add_content_provider(type)
-      content_providers.create(type: type, position: last_position + 1)
-    end
-
-    private
-
-    def last_position
-      content_providers.order(:position).last.try(:position) || 0
-    end
-  end
-end

data/app/models/bit_player/content_provider.rb

@@ -1,63 +0,0 @@
-module BitPlayer
-  # Modeled after the presenter pattern. Ties data layer to view layer.
-  class ContentProvider < ActiveRecord::Base
-    include BitPlayer::ContentProviders::ViewProvider
-
-    belongs_to :content_module,
-               class_name: "BitPlayer::ContentModule",
-               foreign_key: :bit_player_content_module_id,
-               inverse_of: :content_providers
-    belongs_to :source_content, polymorphic: true
-
-    validates :content_module, :position, presence: true
-    validates :position, numericality: { greater_than_or_equal_to: 1 }
-    validates :show_next_nav, inclusion: { in: [true, false] }
-    validate :template_path_exists
-    validate :data_class_exists
-    validate :data_attributes_exist
-
-    serialize :data_attributes
-    serialize :locals
-
-    delegate :context, to: :content_module, prefix: false
-
-    def exists?(position)
-      false
-    end
-
-    def data_class
-      data_class_name.constantize
-    rescue NameError
-      nil
-    end
-
-    # compatibility method
-    def show_nav_link?
-      show_next_nav
-    end
-
-    private
-
-    def template_path_exists
-      path = File.join(Rails.root, "app", "views", template_path || "")
-      return if Dir.exists?(path)
-      errors.add(:template_path, "not found at #{ path }")
-    end
-
-    def data_class_exists
-      unless data_class
-        errors.add(:data_class_name,
-                   "unable to find class '#{ data_class_name }'")
-      end
-    end
-
-    def data_attributes_exist
-      if data_attributes
-        attribute_names = data_class.try(:attribute_names) || []
-        unless data_attributes.all? { |a| attribute_names.include?(a.to_str) }
-          errors.add(:data_attributes, "must be attributes on the model class")
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module BitPlayer
-  module ContentProviders
-    # The default provider.
-    class Null
-      attr_reader :position
-
-      def initialize(content_module, position)
-        @content_module = content_module
-        @position = position
-      end
-
-      def render_current(options)
-        "Content Module #{ @content_module.title }: Oops, did you expect a
-        content provider here?"
-      end
-
-      def show_nav_link?
-        false
-      end
-
-      def exists?(position)
-        false
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-module BitPlayer
-  module ContentProviders
-    # Defines presentation logic for a Slideshow.
-    class SlideshowProvider < ContentProvider
-      def slideshow
-        source_content
-      end
-
-      def render_current(options)
-        options.view_context.render(
-          template: "slides/show",
-          locals: {
-            slide: slide(options.position)
-          }
-        )
-      end
-
-      def slide(position)
-        slideshow.slides.where(position: position).first ||
-          Slide.new(body: "no slides")
-      end
-
-      def exists?(position)
-        slideshow.slides.exists?(position: position)
-      end
-
-      def show_nav_link?
-        true
-      end
-    end
-  end
-end

data/app/models/bit_player/slide.rb

@@ -1,48 +0,0 @@
-require "redcarpet"
-
-module BitPlayer
-  # A page of "static" or presentational content (as opposed to data capture).
-  class Slide < ActiveRecord::Base
-    belongs_to :slideshow,
-               class_name: "BitPlayer::Slideshow",
-               foreign_key: :bit_player_slideshow_id,
-               inverse_of: :slides
-
-    validates :title, :body, :position, presence: true
-    validates :position, numericality: { greater_than_or_equal_to: 1 }
-    validates :position, uniqueness: { scope: :bit_player_slideshow_id }
-
-    before_destroy :push_to_be_deleted_slide_to_end
-
-    def self.update_positions(ids)
-      transaction do
-        connection.execute "SET CONSTRAINTS bit_player_slide_position DEFERRED"
-        ids.each_with_index do |id, index|
-          where(id: id).update_all(position: index + 1)
-        end
-      end
-    end
-
-    def render_body
-      return "" if body.nil?
-
-      Redcarpet::Markdown.new(
-        Redcarpet::Render::HTML.new(
-          filter_html: true,
-          safe_links_only: true
-        ),
-        space_after_headers: true
-      ).render(body).html_safe
-    end
-
-    protected
-
-    def push_to_be_deleted_slide_to_end
-      slide_ids = slideshow.slide_ids
-      slide_ids.delete(id)
-      slide_ids.push(id)
-      slideshow.slides.update_positions(slide_ids)
-    end
-
-  end
-end

data/app/models/bit_player/slideshow.rb

@@ -1,19 +0,0 @@
-module BitPlayer
-  # A collection of ordered Slides.
-  class Slideshow < ActiveRecord::Base
-    has_many :slides,
-             -> { order "position" },
-             class_name: "BitPlayer::Slide",
-             foreign_key: :bit_player_slideshow_id,
-             dependent: :destroy,
-             inverse_of: :slideshow
-    has_one :content_provider,
-            as: :source_content,
-            inverse_of: :source_content,
-            dependent: :nullify
-
-    validates :title, presence: true
-
-    accepts_nested_attributes_for :slides
-  end
-end

data/app/models/bit_player/tool.rb

@@ -1,23 +0,0 @@
-module BitPlayer
-  # A section of an application.
-  class Tool < ActiveRecord::Base
-    has_many :content_modules,
-             class_name: "BitPlayer::ContentModule",
-             foreign_key: :bit_player_tool_id,
-             inverse_of: :tool,
-             dependent: :destroy
-    validates :title, presence: true
-    validates :position, uniqueness: true
-    validates :is_home, inclusion: { in: [true, false] }
-
-    def add_module(title)
-      content_modules.create(title: title, position: last_position + 1)
-    end
-
-    private
-
-    def last_position
-      content_modules.order(:position).last.try(:position) || 0
-    end
-  end
-end

data/app/models/bit_player/video_slide.rb

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

data/db/migrate/20140402225703_change_module_context_to_tool.rb

@@ -1,30 +0,0 @@
-class ChangeModuleContextToTool < ActiveRecord::Migration
-  def up
-    add_column :bit_player_content_modules, :bit_player_tool_id, :integer
-    BitPlayer::ContentModule.reset_column_information
-    BitPlayer::ContentModule.all.each do |content_module|
-      tool = BitPlayer::Tool.find_or_create_by_title(content_module.context)
-      content_module.update!(bit_player_tool_id: tool.id)
-    end
-    change_column_null :bit_player_content_modules, :bit_player_tool_id, false
-    remove_column :bit_player_content_modules, :context
-    execute <<-SQL
-      ALTER TABLE bit_player_content_modules
-        ADD CONSTRAINT fk_content_modules_tools
-        FOREIGN KEY (bit_player_tool_id)
-        REFERENCES bit_player_tools(id)
-    SQL
-  end
-
-  def down
-    execute <<-SQL
-      ALTER TABLE bit_player_content_modules
-        DROP CONSTRAINT fk_content_modules_tools
-    SQL
-    add_column :bit_player_content_modules, :context, :string, null: false
-    BitPlayer::ContentModule.all.each do |content_module|
-      content_module.update(context: content_module.tool.title)
-    end
-    remove_column :bit_player_content_modules, :bit_player_tool_id
-  end
-end

data/db/migrate/20140619200219_add_config_fields_to_providers.rb

@@ -1,9 +0,0 @@
-class AddConfigFieldsToProviders < ActiveRecord::Migration
-  def change
-    add_column :bit_player_content_providers, :template_path, :string
-    add_column :bit_player_content_providers, :data_class_name, :string
-    add_column :bit_player_content_providers, :data_attributes, :text
-    add_column :bit_player_content_providers, :show_next_nav, :boolean
-    add_column :bit_player_content_providers, :locals, :text
-  end
-end

data/spec/fixtures/bit_player/slides.yml

@@ -1,17 +0,0 @@
-slide1:
-  slideshow: slideshow1
-  position: 1
-  title: Slide 1
-  body: lorem...
-
-slide2:
-  slideshow: slideshow1
-  position: 2
-  title: Slide 2
-  body: lorem...
-
-slide3:
-  slideshow: slideshow1
-  position: 3
-  title: Slide 3
-  body: lorem...

data/spec/fixtures/bit_player/slideshows.yml

@@ -1,2 +0,0 @@
-slideshow1:
-  title: Slideshow 1

data/spec/models/bit_player/content_module_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-describe BitPlayer::ContentModule do
-  fixtures :"bit_player/tools", :"bit_player/content_modules",
-           :"bit_player/content_providers"
-
-  describe "#provider" do
-    it "should return the Null Provider when one is not found" do
-      provider = bit_player_content_modules(:home_landing).provider(8)
-      expect(provider.position).to eq(8)
-      expect(provider.class).to eq(BitPlayer::ContentProviders::Null)
-    end
-
-    it "should return the associated provider at the position" do
-      provider = bit_player_content_modules(:home_landing).provider(1)
-      expect(provider.position).to eq(1)
-      expect(provider.class).not_to eq(BitPlayer::ContentProviders::Null)
-    end
-  end
-end

data/spec/models/bit_player/content_provider_spec.rb

@@ -1,46 +0,0 @@
-require "spec_helper"
-
-module BitPlayer
-  describe ContentProvider do
-    describe "validations" do
-      it "should validate the existence of the template path" do
-        p = ContentProvider.new(template_path: "foobaz")
-        p.valid?
-
-        expect(p.errors[:template_path].length).to eq 1
-
-        p.template_path = "layouts"
-        p.valid?
-
-        expect(p.errors[:template_path].length).to eq 0
-      end
-
-      it "should validate the existence of the data class" do
-        p = ContentProvider.new(data_class_name: "foobaz")
-        p.valid?
-
-        expect(p.errors[:data_class_name].length).to eq 1
-
-        p.data_class_name = "BitPlayer::ContentProvider"
-        p.valid?
-
-        expect(p.errors[:data_class_name].length).to eq 0
-      end
-
-      it "should validate the existence of the data attributes" do
-        p = ContentProvider.new(
-          data_class_name: "BitPlayer::ContentProvider",
-          data_attributes: ["baz"]
-        )
-        p.valid?
-
-        expect(p.errors[:data_attributes].length).to eq 1
-
-        p.data_attributes = ["id", "data_attributes"]
-        p.valid?
-
-        expect(p.errors[:data_attributes].length).to eq 0
-      end
-    end
-  end
-end

data/spec/models/bit_player/slide_spec.rb

@@ -1,38 +0,0 @@
-require "spec_helper"
-
-describe BitPlayer::Slide do
-  fixtures :"bit_player/slideshows", :"bit_player/slides"
-
-  describe ".update_positions" do
-    it "should update slide positions to match the order of the ids" do
-      slide1 = bit_player_slides(:slide1)
-      slide2 = bit_player_slides(:slide2)
-      slide3 = bit_player_slides(:slide3)
-      BitPlayer::Slide.update_positions([slide3.id, slide1.id, slide2.id])
-
-      expect(BitPlayer::Slide.find(slide1.id).position).to eq(2)
-      expect(BitPlayer::Slide.find(slide2.id).position).to eq(3)
-      expect(BitPlayer::Slide.find(slide3.id).position).to eq(1)
-    end
-  end
-
-  describe "#render_body" do
-    let(:slide) { BitPlayer::Slide.new }
-
-    it "should render a nil body" do
-      expect(slide.render_body).to eq("")
-    end
-
-    it "should render markdown as html" do
-      slide.body = "# header"
-
-      expect(slide.render_body).to match(/<h1>header<\/h1>/)
-    end
-
-    it "should escape html" do
-      slide.body = "<div>my content</div>"
-
-      expect(slide.render_body).to match(/<p>my content<\/p>/)
-    end
-  end
-end