openstax_utilities 2.2.3 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzJlY2Q5YzY4NDE1MTYxY2RkOTg5OGQyZGFmMTkwZjFlNzQzMWE4NA==
+    NTE4ZjlhOTM0OTAxNzhhMTI2ZWU0ODhiNTIwZTAxZTk3ZGYyOTc0OA==
   data.tar.gz: !binary |-
-    ODIyYzE0OGY1OWEyNzIwZmI3OGI3NTEwNmU5MzM2OWRkYmFiOWY4OQ==
+    MmE0MTg2ZWRhNWRlMDViMjZjODc5NTM2OGYzYjJmZDdlMDI4Y2QzZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDU2MTYzOWIzMWIzMWE2NzA5NTFmM2MyMTRiZGQ1MzFkOWRkNzg5OGIxMTA2
-    ZmZhZTRmMWQyOTkyMWZjZjVlYzI5NTA4NjIxZWVhZGMxNzVmNTM0YWY2OWI5
-    ZDk4ZjE2YjY1YzczNmEzN2UzNTQzNGRlYjE3NmE2ZmZhODQ0ZTE=
+    YjkxMmQ2MGJmMjAyMDczNWJmZmExNzk1ODBhZDRjODYyOTNmMmRiZDE5OWZh
+    ZDljYzY5OTkzMTJiZWVjZTBhYWYxODQ2YjQ1Mzc5N2ExNjg4NmIzOTU0YWI4
+    OGFkYTI4N2QyMjk1ZTBiNzk5ZmI3OGNiNTY2ZTQzY2VlOWU0NWI=
   data.tar.gz: !binary |-
-    MjE3YTNjN2JjNTc2NzhlZTFiODRlZDk3M2I0ZGQ2YmQ5YTJjZWQ2YWU3MGRm
-    YzA1ZTJiOTBmNzY2YWExMzQ3NzQ4MjdiZmIzNzUyNmIzOWJlNDhjZGZkYjBi
-    NTQ1ZmMwNjI2YzY4YmJhNDhlNTY4MjAxMjMwOTRjYWViZTNiYjc=
+    YjliMzBmNTk3YjNmMWQyYTE4ZTM4OTc1YmRlZWYyMGZiZTIwMjhmNzFiY2Jh
+    ZjAzMGJhOTk3ODExNzY0NDliM2QxY2JkYjhmNTMyZmVhZDdhZDBmN2M1NmFh
+    OWMzYWY4OTkzY2YzYmY0MmRjZGQ2YTdjOWQyZTQyNjE0OTIzYTI=

data/app/helpers/openstax/utilities/osu_helper.rb

@@ -4,7 +4,6 @@ module OpenStax::Utilities
     def osu
       @@osu_class ||= Class.new(ClassyHelper) do
         include OpenStax::Utilities::Helpers::Misc
-        include OpenStax::Utilities::Helpers::Blocks
         include OpenStax::Utilities::Helpers::Partials
         include OpenStax::Utilities::Helpers::ActionList
         include OpenStax::Utilities::Helpers::Datetime

data/lib/openstax/utilities/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Utilities
-    VERSION = "2.2.3"
+    VERSION = "3.0.0"
   end
 end

data/lib/openstax_utilities.rb

@@ -22,17 +22,10 @@ require "openstax/utilities/access_policy"
 
 require "openstax/utilities/classy_helper"
 require "openstax/utilities/helpers/misc"
-require "openstax/utilities/helpers/blocks"
 require "openstax/utilities/helpers/partials"
 require "openstax/utilities/helpers/action_list"
 require "openstax/utilities/helpers/datetime"
 
-require 'openstax/utilities/blocks/block_base'
-require 'openstax/utilities/blocks/section_block'
-require 'openstax/utilities/blocks/table_block'
-require 'openstax/utilities/blocks/table_cell_block'
-require 'openstax/utilities/blocks/table_row_block'
-
 module OpenStax
   module Utilities
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_utilities
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: attribeautiful
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,27 +66,17 @@ files:
 - app/assets/stylesheets/openstax_utilities.css
 - app/helpers/openstax/utilities/osu_helper.rb
 - app/views/osu/shared/_action_list.html.erb
-- app/views/osu/shared/_section.html.erb
-- app/views/osu/shared/_table.html.erb
-- app/views/osu/shared/_table_cell.html.erb
-- app/views/osu/shared/_table_row.html.erb
 - lib/openstax/utilities/access.rb
 - lib/openstax/utilities/access_policy.rb
 - lib/openstax/utilities/action_list.rb
 - lib/openstax/utilities/active_record_extensions.rb
 - lib/openstax/utilities/acts_as_numberable.rb
-- lib/openstax/utilities/blocks/block_base.rb
-- lib/openstax/utilities/blocks/section_block.rb
-- lib/openstax/utilities/blocks/table_block.rb
-- lib/openstax/utilities/blocks/table_cell_block.rb
-- lib/openstax/utilities/blocks/table_row_block.rb
 - lib/openstax/utilities/classy_helper.rb
 - lib/openstax/utilities/delegate_access_control.rb
 - lib/openstax/utilities/engine.rb
 - lib/openstax/utilities/enum.rb
 - lib/openstax/utilities/exceptions.rb
 - lib/openstax/utilities/helpers/action_list.rb
-- lib/openstax/utilities/helpers/blocks.rb
 - lib/openstax/utilities/helpers/datetime.rb
 - lib/openstax/utilities/helpers/misc.rb
 - lib/openstax/utilities/helpers/partials.rb

data/app/views/osu/shared/_section.html.erb

@@ -1,17 +0,0 @@
-<%# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-    License version 3 or later.  See the COPYRIGHT file for details. %>
-
-<div <%= block.section_id_attr %> <%= block.section_class_attr %> >
-
-  <% if block.show_heading? %>
-    <div <%= block.heading_class_attr %> >
-      <%= block.heading %>
-    </div>
-  <% end %>
-
-  <div <%= block.body_class_attr %> >
-    <%= block.captured_block %>
-  </div>
-
-</div>
-

data/app/views/osu/shared/_table.html.erb

@@ -1,22 +0,0 @@
-<%# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-    License version 3 or later.  See the COPYRIGHT file for details. %>
-
-<table <%= block.table_id_attr %> <%= block.table_class_attr %> >
-  <% if block.show_caption? %>
-    <caption <%= block.caption_class_attr %> >
-      <%= block.title %>
-    </caption>
-  <% end %>
-
-  <tr <%= block.heading_row_class_attr %> >
-    <% block.column_names.each do |column_name| %>
-      <th <%= block.heading_cell_class_attr %> >
-        <%= column_name %>
-      </th>
-    <% end %>
-  </tr>
-
-  <% block.row_blocks.each do |row_block| %>
-    <%= row_block %>
-  <% end %>
-</table>

data/app/views/osu/shared/_table_cell.html.erb

@@ -1,6 +0,0 @@
-<%# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-    License version 3 or later.  See the COPYRIGHT file for details. %>
-
-<td <%= block.td_id_attr %> <%= block.td_class_attr %> <%= block.td_colspan_attr %> >
-  <%= block.captured_block %>
-</td>

data/app/views/osu/shared/_table_row.html.erb

@@ -1,8 +0,0 @@
-<%# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-    License version 3 or later.  See the COPYRIGHT file for details. %>
-
-<tr>
-  <% block.cell_blocks.each do |cb| %>
-    <%= cb %>
-  <% end %>
-</tr>

data/lib/openstax/utilities/blocks/block_base.rb

@@ -1,38 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-   
-require 'attribeautiful'
-
-module OpenStax::Utilities::Blocks 
-  class BlockBase
-    include Attribeautiful
-
-    attr_accessor :captured_block
-
-    def initialize(template, partial, passed_block)
-      self.h            = template
-      self.passed_block = passed_block
-      self.partial      = partial
-    end
-
-    def to_s
-      render_passed_block
-      render_partial
-    end
-
-  protected
-
-    attr_accessor :h
-    attr_accessor :passed_block
-    attr_accessor :partial
-
-    def render_passed_block
-      self.captured_block ||= h.capture self, &passed_block
-    end
-
-    def render_partial
-      h.render :partial => "osu/shared/#{partial}", :locals => { :block => self }
-    end
-
-  end
-end

data/lib/openstax/utilities/blocks/section_block.rb

@@ -1,60 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-
-module OpenStax::Utilities::Blocks
-  class SectionBlock < BlockBase
-
-    html_element :section
-    html_element :heading
-    html_element :body
-
-    attr_accessor :heading
-    attr_accessor :nesting
-    attr_accessor :top_bar
-
-    def initialize(template, heading, block)
-      super(template, "section", block)
-
-      set_heading(heading) if !heading.blank?
-      section_class_add "section-block-section"
-      heading_class_add "section-block-heading"
-      body_class_add    "section-block-body"
-    end
-
-    def set_heading(string)
-      self.heading = string
-      self
-    end
-
-    def set_nesting(depth)
-      self.nesting = depth
-      self
-    end
-
-    def set_top_bar
-      raise "SectionBlock top bar cannot be changed once initialized" \
-        if @top_bar
-      section_class_add "bar-top"
-      self.top_bar = true
-      self
-    end
-
-    def heading=(string)
-      raise "SectionBlock heading cannot be changed once initialized" \
-        if @heading
-      @heading = string
-    end
-
-    def nesting=(depth)
-      raise "SectionBlock nesting cannot be changed once initialized" \
-        if @nesting
-      section_class_add "nesting-#{depth}"
-      @nesting = depth
-    end
-
-    def show_heading?
-      heading.present?
-    end
-
-  end
-end

data/lib/openstax/utilities/blocks/table_block.rb

@@ -1,74 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-
-module OpenStax::Utilities::Blocks
-  class TableBlock < BlockBase
-
-    html_element :table
-    html_element :caption
-    html_element :heading_row
-    html_element :heading_cell
-
-    attr_reader :column_names
-    attr_reader :row_blocks
-    attr_reader :title
-
-    def initialize(template, block)
-      super(template, "table", block)
-      self.column_names = []
-      self.row_blocks   = []
-
-      self.table_class_add "table-block-table"
-
-    end
-
-    def set_title(table_title)
-      self.title = table_title
-      self
-    end
-
-    def title=(table_title)
-      raise "TableBlock title cannot be changed once initialized" \
-        if @title
-      @title = table_title
-    end
-
-    def add_column(column_name)
-      self.column_names << column_name
-      self
-    end
-
-    def add_row_block(&block)
-      self.row_blocks << h.table_row_block(&block)
-      self
-    end
-
-    def add_row(*args)
-      trb = h.table_row_block do |rb|
-        args.each do |arg|
-          rb.add_cell(arg)
-        end
-      end
-      self.row_blocks << trb
-      self
-    end
-
-    def add_section_heading(heading)
-      trb = h.table_row_block do |rb|
-        rb.set_section_heading(heading, column_names.count)
-      end
-      self.row_blocks << trb
-      self    
-    end
-
-    def show_caption?
-      title.present?
-    end
-
-  protected
-
-    attr_writer :column_names
-    attr_writer :row_blocks
-
-  end
-end

data/lib/openstax/utilities/blocks/table_cell_block.rb

@@ -1,26 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-
-module OpenStax::Utilities::Blocks
-  class TableCellBlock < BlockBase
-
-    html_element :td
-
-    def initialize(template, block)
-      super(template, "table_cell", block)
-    end
-
-    def self.from_value(template, value)
-      tcb = TableCellBlock.new(template, Proc.new {})
-      tcb.captured_block = value
-      tcb
-    end
-
-    def set_section_heading(colspan)
-      self.td_class_add "section-heading"
-      self.td_colspan_add colspan
-      self
-    end
-
-  end
-end

data/lib/openstax/utilities/blocks/table_row_block.rb

@@ -1,49 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-
-module OpenStax::Utilities::Blocks
-  class TableRowBlock < BlockBase
-
-    attr_reader :cell_blocks
-    attr_reader :section_heading
-
-    def initialize(template, block)
-      super(template, "table_row", block)
-      self.cell_blocks     = []
-      self.section_heading = false
-    end
-
-    def add_cell_block(&block)
-      self.cell_blocks << h.table_cell_block(&block)
-      self
-    end
-
-    def add_cell(value)
-      self.cell_blocks << TableCellBlock.from_value(h, value)
-    end
-
-    def section_heading?
-      section_heading
-    end
-
-    def set_section_heading(heading, colspan)
-      raise "TableRowBlock cannot be a table section heading if it contains cells" \
-        if cell_blocks.any?
-      raise "TableRowBlock section heading cannot be changed once initialized" \
-        if section_heading?
-
-      tcb = TableCellBlock.from_value(h, heading)
-      tcb.set_section_heading(colspan)
-      self.cell_blocks << tcb
-
-      self.section_heading = true
-      self
-    end
-
-  protected
-
-    attr_writer :cell_blocks
-    attr_writer :section_heading
-
-  end
-end

data/lib/openstax/utilities/helpers/blocks.rb

@@ -1,24 +0,0 @@
-# Copyright 2011-2013 Rice University. Licensed under the Affero General Public 
-# License version 3 or later.  See the COPYRIGHT file for details.
-
-module OpenStax::Utilities::Helpers
-  module Blocks
-
-    def section_block(heading=nil, &block)
-      presenter = OpenStax::Utilities::Blocks::SectionBlock.new(true_self, heading, block)
-    end
-
-    def table_block(&block)
-      presenter = TableBlock.new(true_self, block)
-    end
-
-    def table_row_block(&block)
-      presenter = TableRowBlock.new(true_self, block)
-    end
-
-    def table_cell_block(&block)
-      presenter = TableCellBlock.new(true_self, block)
-    end
-
-  end
-end