effective_style_guide 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24a4d856695248b04d97fb9259742bb4fbf1647
-  data.tar.gz: 0e6081a373ec6b5b9c44e68bdb38603fd551ff7c
+  metadata.gz: 488b4a3c26294b4efb95214be897f6674e1ac6f8
+  data.tar.gz: d4cfb01b66e04eac155b044fd92ea7071401fba6
 SHA512:
-  metadata.gz: 64965adf79bd62d76f7bd4bcf632172d2e2d376f0efafe37fe1be7cf3fc84909a31f3a4ee1bd298eb9e00bce67df14e319a005b015d8ffd9125a694a8701bbbe
-  data.tar.gz: 34bbe57d6672082fe91aaa811c1d3a1d1d0bed65681117b7e1a2d7216b50b699c80eb40c7d73ce3fe3152742b6b1162594d0275899ed669645987a1b3ad75711
+  metadata.gz: c978e3908ed3fc060ac125066a6acd638341d9be4bc76c842ad960ceabf7c0127b4e650e2f8734fbf9a802106918c1d7c546f08861882f85bb73bc6372d6527b
+  data.tar.gz: 7721163f6b5263050c6230b7b0947bf2c484ed60c40b469de34ae0d7c8c687f363e45ef39934de5663ea04c7478c86c216de6a815bd0cd2d2fbca55ac836206f

data/app/controllers/effective/style_guide_controller.rb

@@ -3,16 +3,23 @@ module Effective
     layout EffectiveStyleGuide.layout || 'application'
 
     def show
-      @partials = view_paths.map { |path| Dir["#{path}/effective/style_guide/_**"] }.flatten.map do |path|
-        name = File.basename(path)
-        name[1...name.index('.') || name.length] # remove the _ and .html.haml
-      end.uniq.sort
-
-      @partials = @partials.reject { |p| p.start_with?('_') } # Remove any double __ partials
+      @partials = if defined?(EffectiveFormInputs)
+        view_paths.map { |path| Dir["#{path}/effective/style_guide_bootstrap3/_**"] }.flatten.map do |path|
+          name = File.basename(path)
+          name[1...name.index('.') || name.length] # remove the _ and .html.haml
+        end.uniq.sort
+      else
+        view_paths.map { |path| Dir["#{path}/effective/style_guide/_**"] }.flatten.map do |path|
+          name = File.basename(path)
+          name[1...name.index('.') || name.length] # remove the _ and .html.haml
+        end.uniq.sort
+      end.reject { |p| p.start_with?('_') } # Remove any double __ partials
 
       @page_title ||= 'Style Guide'
 
       EffectiveStyleGuide.authorize!(self, :show, Effective::StyleGuide.new())
+
+      render "effective/style_guide#{'_bootstrap3' if defined?(EffectiveFormInputs)}/show"
     end
 
     def bootstrap3

data/app/models/effective/style_guide.rb

@@ -2,10 +2,6 @@ module Effective
   class StyleGuide
     include ActiveModel::Model
 
-    if defined?(EffectiveAssets)
-      acts_as_asset_box files: 1..6
-    end
-
     ATTRIBUTES = [
       :id, :title, :email, :password, :number, :range, :category, :content, :phone, :fax, :cell,
       :url, :color, :option1, :option2, :option3, :details,

data/app/views/effective/style_guide_bootstrap3/_form_horizontal.html.haml

@@ -69,11 +69,6 @@
       :collection => EffectiveStyleGuide.foods,
       :hint => 'please select one food (this is a radio_buttons field)'
 
-  - if defined?(EffectiveAssets)
-    = f.input :files,
-      :as => :asset_box,
-      :hint => 'please upload one or more files (this is an asset_box field from EffectiveAssets)'
-
   - if defined?(EffectiveFormInputs)
     = f.input :updated_at,
       :as => :effective_date_time_picker,
@@ -178,11 +173,6 @@
       :collection => EffectiveStyleGuide.foods,
       :hint => 'please select one food (this is a radio_buttons field)'
 
-  - if defined?(EffectiveAssets)
-    = f.input :files,
-      :as => :asset_box,
-      :hint => 'please upload one or more files (this is an asset_box field from EffectiveAssets)'
-
   - if defined?(EffectiveFormInputs)
     = f.input :updated_at,
       :as => :effective_date_time_picker,

data/app/views/effective/style_guide_bootstrap3/_form_vertical.html.haml

@@ -69,11 +69,6 @@
       :collection => EffectiveStyleGuide.foods,
       :hint => 'please select one food (this is a radio_buttons field)'
 
-  - if defined?(EffectiveAssets)
-    = f.input :files,
-      :as => :asset_box,
-      :hint => 'please upload one or more files (this is an asset_box field from EffectiveAssets)'
-
   - if defined?(EffectiveFormInputs)
     = f.input :updated_at,
       :as => :effective_date_time_picker,
@@ -176,9 +171,6 @@
       :collection => EffectiveStyleGuide.foods,
       :hint => 'please select one food (this is a radio_buttons field)'
 
-  - if defined?(EffectiveAssets)
-    = f.input :files, :as => :asset_box, :hint => 'please upload one or more files (this is an asset_box field from EffectiveAssets)'
-
   - if defined?(EffectiveFormInputs)
     = f.input :updated_at,
       :as => :effective_date_time_picker,

data/lib/effective_style_guide/version.rb

@@ -1,3 +1,3 @@
 module EffectiveStyleGuide
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_style_guide
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement