shoestrap 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c090c4eecc46f877fcd70713bf67189db14d0336
-  data.tar.gz: 8af9d3380f575421ee964a7398253ccb79492dac
+  metadata.gz: b5160f485c9d7e9e55efcb16dd0fb1d197fa9be3
+  data.tar.gz: 57c03550346f52fa0794c28bd105b21c6b00c4d6
 SHA512:
-  metadata.gz: 8059259f412ed24aed9ba29e53ecda51dd230156505e2afff76005443d3a8b9f553f24865728b2d00879b755d4aca36b2c4685eef5a798bdf069d49b33290800
-  data.tar.gz: fd24600c582956c778182cfcbc36dd6c3e0b7d7d472a6c3f7f327d9dad314eeb6c043e972cce0d9b6c45972845f25ab79e6e213203b46285807f1bb6da63f296
+  metadata.gz: c13e977d49958f335020cd0e5a37f5faf25e5e87ec8014bdc6f763c616ac0d2df9a610821b0ad300c840ba2d71b612263342af84802816223706e49127d9ea2d
+  data.tar.gz: 90f4bc4bbc510478a72a7a8742a4f99e60638f0fe80e50ba4bc814806e519bf775cd6899867ec036ffda1162e154d824b67ebe01f24987a4018d26be7ebc3cb4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.0 - 2013-10-07
+
+- add nicer method of defining attributes that are shown in index/edit views
+
 ## 1.0.2 - 2013-10-02
 
 - Fix Kuhaft `content_for :head` block integration and document how to use it

data/lib/generators/shoestrap/cms_generator.rb

@@ -29,20 +29,21 @@ module Shoestrap
 
     def add_model_and_migration
       generate 'model', model_name
-      #TODO: this results in a very messed up indentation in the model. fix!
+      inject_into_file "app/models/#{model_name}.rb", before: 'class' do
+        "require 'shoestrap/cms_model'\n\n"
+      end
+
       inject_into_file "app/models/#{model_name}.rb", before: 'end' do
-        "  class << self
-             # define what attributes are shown in form and permitted by strong parameters
-             def editable_attributes
-               []
-             end
-
-             # define what attributes are shown in index view
-             def index_attributes
-               []
-             end
-           end\n
-        "
+        <<-eos.gsub(/^ {8}/, '').chomp
+          include Shoestrap::CMSModel
+
+          # TODO: Define what attributes are shown in the form and permitted by strong parameters
+          # editable_attributes :title, :body
+
+          # TODO: Define what attributes are shown in the index view
+          # index_attributes :id, :title
+
+         eos
       end
     end
 
@@ -58,7 +59,7 @@ module Shoestrap
     private
 
     def shoestrap_cms_already_installed?
-      File.exists? 'app/controllers/shoestrap/base_controller.rb'
+      File.exists?('app/controllers/shoestrap/base_controller.rb') && File.exists?('config/cms_navigation.rb')
     end
 
     def setup_base_controller

data/lib/generators/shoestrap/gem_install_generator.rb

@@ -1,4 +1,3 @@
-require 'pry'
 require 'rails/generators'
 
 module Shoestrap

data/lib/shoestrap/cms_model.rb

@@ -0,0 +1,25 @@
+module Shoestrap
+  module CMSModel
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def index_attributes(*attributes)
+        if attributes.empty?
+          instance_variable_get(:@shoestrap_index_attributes)
+        else
+          instance_variable_set(:@shoestrap_index_attributes, attributes)
+        end
+      end
+
+      def editable_attributes(*attributes)
+        if attributes.empty?
+          instance_variable_get(:@shoestrap_editable_attributes)
+        else
+          instance_variable_set(:@shoestrap_editable_attributes, attributes)
+        end
+      end
+    end
+  end
+end

data/lib/shoestrap/version.rb

@@ -1,3 +1,3 @@
 module Shoestrap
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/shoestrap/cms_model.rb

@@ -0,0 +1,29 @@
+require_relative '../../lib/shoestrap/cms_model'
+require_relative '../spec_helper'
+
+module Shoestrap
+  describe CMSModel do
+
+    describe 'index_attributes class macro' do
+      let(:dummy) { class Dummy; include Shoestrap::CMSModel; end }
+
+      it 'is a class macro' do
+        expect{ dummy.class_eval { index_attributes :title, :created_at } }.not_to raise_error
+      end
+
+      it 'allows to define attribute names that should be shown in the index table' do
+        dummy.class_eval { index_attributes :title, :created_at }
+        expect(dummy.instance_variable_get('@shoestrap_index_attributes')).to eq [:title, :created_at]
+      end
+    end
+
+    describe 'index attributes class method' do
+      let(:dummy) { class Dummy; include Shoestrap::CMSModel;  end }
+
+      it 'returns the attribute names defined with class macro' do
+        dummy.class_eval { index_attributes :title, :created_at }
+        expect(dummy.index_attributes).to eq [:title, :created_at]
+      end
+    end
+  end
+end

data/templates/cms_generator/inherited_views/base/_form.html.haml

@@ -1,8 +1,8 @@
-= simple_form_for([:cms, resource]), wrapper: :bootstrap do |f|
+= simple_form_for([:cms, resource], wrapper: :bootstrap) do |f|
   = f.error_notification
 
   .form-inputs
-    - resource.class.column_names.reject {|c| ['id', 'created_at', 'updated_at'].include? c }.each do |column_name|
+    - resource.class.editable_attributes.each do |column_name|
       = f.input column_name
 
   .form-actions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoestrap
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Felipe Kaufmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,12 +214,14 @@ files:
 - lib/shoestrap.rb
 - lib/shoestrap/application_generator.rb
 - lib/shoestrap/cli.rb
+- lib/shoestrap/cms_model.rb
 - lib/shoestrap/railtie.rb
 - lib/shoestrap/shell.rb
 - lib/shoestrap/version.rb
 - shoestrap.gemspec
 - spec/shoestrap/application_generator_spec.rb
 - spec/shoestrap/cli_spec.rb
+- spec/shoestrap/cms_model.rb
 - spec/spec_helper.rb
 - templates/application_generator/_typekit.html.haml
 - templates/application_generator/application.html.haml
@@ -303,4 +305,5 @@ test_files:
 - features/shoestrap/generators/view_files_generator_spec.rb
 - spec/shoestrap/application_generator_spec.rb
 - spec/shoestrap/cli_spec.rb
+- spec/shoestrap/cms_model.rb
 - spec/spec_helper.rb