feather_cms 0.0.2 → 0.0.3

data/README.md

@@ -10,13 +10,15 @@ Add the gem to your Gemfile
 
 Now, generate the pages 
 
-    $ rake db:migrate
-
     # Use file system to store pages( default: public/system/templates)
     $ rails g feather_cms about_us jobs team
     
     #Use db to store pages
     $ rails g feather_cms about_us jobs team --storage=db
+    or
+    $ rails g feather_cms about_us jobs team -t=db
+
+    $ rake db:migrate
 
 This generates a route, the controller action and the view for each page. Start the server and use the URL http://localhost:3000/feathers/pages to go to the admin panel. 
 

data/lib/feather_cms/config.rb

@@ -28,24 +28,20 @@ module FeatherCms
         end
       end
 
-      def template_store_path=(value)
-        @@config[:template_store_path] = value
-      end
-
-      def template_store_path
-        @@config[:template_store_path]
-      end
-
-      def template_extenstion=(value)
-        @@config[:template_extenstion] = value
+      def layouts
+        @@config[:layouts]
       end
 
-      def template_extenstion
-        @@config[:template_extenstion] 
-      end
+      [:template_store_path, :template_extenstion, :authentication].each do |attr|
+        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          def #{attr}=(value)
+            @@config[:#{attr}] = value
+          end
 
-      def layouts
-        @@config[:layouts]
+          def #{attr}
+            @@config[:#{attr}]
+          end
+        METHOD
       end
 
     end

data/lib/feather_cms/version.rb

@@ -1,3 +1,3 @@
 module FeatherCms
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/feather_cms/USAGE

@@ -5,6 +5,9 @@ Description:
 Example:
     rails generate feather_cms about_us jobs [--storage=file or db]
 
+    Options
+    --storage= file or db / -t= file or db
+
     This will create:
-      - Add config file 'feather_cms.eb'
+      - Add config file 'feather_cms.rb'
       - Add Codemirror javascript and css

data/lib/generators/feather_cms/feather_cms_generator.rb

@@ -1,17 +1,10 @@
-class FeatherCmsGenerator < Rails::Generators::NamedBase
+class FeatherCmsGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   argument :attributes, :type => :array, :banner => "about_us jobs"
-  argument :name, :type => :string, :default => "feather_cms", :required => false 
-  class_option :storage, :aliases => '-s', :type => :string, :desc => 'db or file storage.'
+  class_option :storage, :aliases => '-t', :type => :string, :desc => 'db or file storage.'
 
   def create_cms_files
-    @pages = attributes.collect(&:name)
-
-    @storage = if ['file', 'db'].include?(options['storage'])
-                 options['storage']
-               else
-                 'file'
-               end
+    @storage = ['file', 'db'].include?(options['storage']) ? options['storage'] : 'file'
 
     template 'initializer.rb', 'config/initializers/feather_cms.rb'
     template 'controller.rb', 'app/controllers/feathers_controller.rb'
@@ -25,17 +18,25 @@ class FeatherCmsGenerator < Rails::Generators::NamedBase
                        end
 
     template 'migration.rb', "db/migrate/#{migration_number}_create_feather_pages.rb"
+  end
+
+  def add_routes
+    feather_route =  
+<<-ROUTES
 
-    route %{scope '/feathers' do
+  scope '/feathers' do
     match 'page/:type/(:status)' => 'feathers#page', :as => :feather_page
     get 'pages' => 'feathers#index', :as => :feather_pages
     get 'preivew/:type/(:status)' => 'feathers#preivew', :as => 'feather_page_preview'
   end
-  get 'page/:type' => 'feathers#published', :as => 'feather_published_page'}
+  get 'page/:type' => 'feathers#published', :as => 'feather_published_page'
+ROUTES
+
+    route feather_route
   end
 
   def copy_view_files
-    @pages = attributes.collect(&:name)
+    @pages = attributes
     base_path = File.join("app/views/feathers")
     #empty_directory base_path
     template 'layout.html.erb', 'app/views/layouts/feather_layout.html.erb'
@@ -58,6 +59,4 @@ class FeatherCmsGenerator < Rails::Generators::NamedBase
     end
   end
 
-
-
 end

data/lib/generators/feather_cms/templates/controller.rb

@@ -1,5 +1,11 @@
 class FeathersController < ApplicationController
-  http_basic_authenticate_with name: 'feather', password: 'password', except: :published
+
+  if FeatherCms::Config.authentication.kind_of?(Hash)
+    http_basic_authenticate_with FeatherCms::Config.authentication.merge(except: :published)
+  else
+    before_filter FeatherCms::Config.authentication.to_sym, except: :published
+  end
+
   before_filter :find_page, only: [:page, :preivew]
 
   layout 'feather_layout', except: [:preivew, :published]

data/lib/generators/feather_cms/templates/initializer.rb

@@ -1,5 +1,11 @@
 FeatherCms::Config.init do |c|
   c.template_store_path = 'public/system/templates'
   c.template_store_type = :<%= @storage %> 
+
+  #Note: For basic authentication
+  c.authentication = {name: 'feather', password: 'password'}
+  #Note: For before filter
+  #c.authentication = :authenticate_user!
+  
   #c.template_extenstion = 'html'   #default : html
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feather_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156032340 !ruby/object:Gem::Requirement
+  requirement: &2152283260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156032340
+  version_requirements: *2152283260
 description: Lightweight do it youself cms
 email:
 - jiren@joshsoftware.com