pixelforce_cms 1.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86bec6a7b350b5ed94ff8971e264aaf394a9e469
-  data.tar.gz: 1d6b2eaa36c1b0d61b2904f870554dcd2ec5bf2c
+  metadata.gz: 94e369f2069cd38fa8eecd04613410930fcb3f57
+  data.tar.gz: cdfd0a098e1909fd2b2f65283bc56a11cf506781
 SHA512:
-  metadata.gz: 5df76fd6877d523ef3f9c58af924411f07a0832b160b0f2359999969623980be30f7de407aa90206a114f3cfc29ba00eed8267f104a1400ec5de47b452c6b3cb
-  data.tar.gz: 36ee115dd8290a567da2133dc6ed9b629a35550c819d195d2930604d5342fc241e639ec48821545a7d273ed9055a818a45a5b174ee8bd6e5b414fe086fa655e9
+  metadata.gz: 52905a0d469cccf95820593d9c4617ec799481c7c612e307e30a10a4e006d5d605fce3d6b9954173a85735e46fc2d5a9fe27f4ce35871fcbf3b497f7eff99f0d
+  data.tar.gz: 6136a1284ad341df49261e678d1fd3175d441d4d886037069f360cd678b6945eb3f1764e61b4597efcace98535f6bed62367c4d5eea6e1370d734e66e1a7b072

data/lib/generators/pixelforce_cms/install_generator.rb

@@ -57,6 +57,7 @@ module PixelforceCms
 
       def copy_model_files
         copy_file "pretty_url.rb", "app/models/concerns/pretty_url.rb"
+        copy_file "double.rb", "app/models/double.rb"
       end
 
       def config_application

data/lib/generators/pixelforce_cms/templates/Gemfile

@@ -1,79 +1,89 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.18'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.8'
 
-gem 'mysql2'
+gem 'pg'
 
-gem 'devise',      '~> 3.1'
-gem 'simple_form', '~> 2.0'
+# SEO pack
+gem 'sitemap_generator'
+gem 'meta-tags', require: 'meta_tags'
+
+gem 'nested_form', git: 'git://github.com/BenZhang/nested_form.git'
+
+gem 'haml-rails'
+
+gem 'font-awesome-rails'
+gem 'html5-rails'
+gem 'fancybox2-rails'
+
+gem 'sass-rails', '~> 4.0.3'
+gem 'compass-rails'
+gem 'compass-h5bp'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'therubyracer',  platforms: :ruby
+gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
+gem 'bootstrap-sass', '~> 3.0.3.0'
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+gem 'jquery-ui-rails'         
+
+gem 'devise', '~> 3.4.1'
 gem 'paperclip'
+gem 'cancan'
+gem 'exception_notification', '~> 4.0.1'
 
-# SEO pack
-gem 'meta-tags', :require => 'meta_tags'
-
-# exception handle
-gem 'exception_notification'
-
-# pixelforce template
-gem 'pixelforce_cms', '~> 0.9.9.5'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.6'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  #HTML5
-  gem 'compass-rails', '~> 1.1.7'
-  gem 'compass-h5bp', '~> 0.1.2'
-  gem 'uglifier', '>= 1.0.3'
-
-  #Bootstrap
-  gem "therubyracer"
-  gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
-  gem 'bootstrap-sass', '~> 3.0.3.0'
-  
-  gem 'jquery-ui-rails'         
-  gem 'fancybox2-rails', '~> 0.2.4'                       
-end
+#pagination
+gem 'kaminari'
+gem 'bootstrap-kaminari-views'
+gem 'simple_form'
+gem 'au_state_select', '~> 1.1'
 
-group :development, :test do
-  gem 'quiet_assets'
+#ancestry
+gem 'ancestry'
+
+group :test do
   gem 'rspec'
-  gem 'rspec-rails',       '~> 2.13'
-  # Deploy with Capistrano
-  gem 'capistrano'
-  gem 'rvm-capistrano'
-  gem "capistrano-db-tasks", require: false, github: 'gkopylov/capistrano-db-tasks', ref: 'f3949cd'
-  gem 'factory_girl_rails'
-  gem 'thin'
+  gem 'rspec-rails', '~> 3.0'
+  gem 'simplecov'
+  gem "factory_girl_rails", "~> 4.0"
 end
 
-gem "font-awesome-rails"
-gem 'sass'
-gem 'html5-rails'
-gem 'jquery-rails'
+gem 'ckeditor'
 
-gem 'haml', '~> 4.0.0'
-gem 'haml-rails', '~> 0.4'
+# keep track of views count
+gem 'views_count', '0.0.3'
 
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
+# Use ActiveModel has_secure_password
+gem 'bcrypt', '~> 3.1.7'
 
 # Use unicorn as the app server
 gem 'unicorn'
 
-# Deploy with Capistrano
-# gem 'capistrano'
+gem 'jquery-datetimepicker-rails'
+
+
+group :development do
+  gem 'spring'
+  gem 'capistrano', '2.15.5'
+  gem 'rvm-capistrano'
+  gem "capistrano-db-tasks", require: false, github: 'gkopylov/capistrano-db-tasks', ref: 'f3949cd'
+  gem 'quiet_assets'
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem 'pixelforce_cms', '~> 1.0'
+end
 
-# To use debugger
-# gem 'debugger'
+# Use debugger
+# gem 'debugger', group: [:development, :test]

data/lib/generators/pixelforce_cms/templates/double.rb

@@ -0,0 +1,17 @@
+class Double
+  include ActiveModel::Conversion
+  extend  ActiveModel::Naming
+  include ActiveModel::Validations
+
+  def initialize(attrs = {})    
+  end
+
+  def persisted?
+    false
+  end
+
+  def method_missing(method_sym, *arguments, &block)
+    return ''
+  end
+
+end

data/lib/generators/pixelforce_cms/templates/pretty_url.rb

@@ -2,7 +2,18 @@ module PrettyUrl
   extend ActiveSupport::Concern
 
   included do
-    before_save :update_url_name
+    after_save :update_url_name
+  end
+
+  module ClassMethods
+    def find(id, options = {})
+      if id.is_a?(String)
+        real_id = /(.*\-)?(?<id>\d+)\Z/.match(id)[:id]
+      else
+        real_id = id
+      end
+      super(real_id, options)
+    end
   end
 
   def to_param
@@ -11,7 +22,7 @@ module PrettyUrl
 
   private
   def update_url_name
-    self.url_name = name.parameterize if name_changed? and !url_name_changed?    
+    self.url_name = "#{name.to_url}-#{id}" if name_changed? and !url_name_changed?    
   end
 
 end

data/lib/pixelforce_cms/version.rb

@@ -1,3 +1,3 @@
 module PixelforceCms
-  VERSION = "1.0"
+  VERSION = "2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_cms
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '2.0'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/generators/pixelforce_cms/templates/css/style.css.scss
 - lib/generators/pixelforce_cms/templates/css/style.responsive.css.scss
 - lib/generators/pixelforce_cms/templates/deploy.rb
+- lib/generators/pixelforce_cms/templates/double.rb
 - lib/generators/pixelforce_cms/templates/edit.html.haml
 - lib/generators/pixelforce_cms/templates/index.html.haml
 - lib/generators/pixelforce_cms/templates/javascripts/application.js