landable 1.7.1.rc1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d0d159a866cc88742e6b5603bcd0d5edb09b65
-  data.tar.gz: 2f1aa05942baaedab945f6163cebd4e65c5e4599
+  metadata.gz: 816bb86d55b2ddcc550fba26aa46b38866f1cc4d
+  data.tar.gz: f995700b848201ee82badbcb96fdc9f2f7c3934d
 SHA512:
-  metadata.gz: d9faf6bc62457e8a574dc47ca2eb6a2b95593bb2bcc72db13bc1d3f54ba327bb241fff269d658a27ac8d72e8412b4e36804b01fc1485d5ed1b3afce450d8e09b
-  data.tar.gz: ba14a46c7b46ae299eeb77d6b65568747ec989c3553816a0e947d70d9de1f7eb4f9d381eb60edad56edeca5cc45ce579a7b9cfb3f18ec8b4d1cc35815b705606
+  metadata.gz: ddbe06e57c7d69674f0861fb99869d76bf562c5148f7c97ee352b1ea73c7c532809aac6e9f87e26fab42f78164633d749820604622287717721ec5b504def4cc
+  data.tar.gz: 88dbec3b8cd76fcdf58f026b9ff748840d6f3c1639e0127b46b456ba15179d88d9bb56780cb5ea41029cdd2c21f2facbd17ab1cba1421ca887d56a1fc28ca4b0

data/.gitignore

@@ -2,12 +2,15 @@
 *.swp
 Gemfile.lock
 .bundle/
+db/test/output.txt
 log/*.log
 pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
+spec/dummy/db/structure.sql
 spec/dummy/.sass-cache
 coverage/
 tmp/
+landable-*.gem

data/.rbenv-gemsets

@@ -0,0 +1 @@
+landable

data/.travis.yml

@@ -1,12 +1,30 @@
 language: ruby
+
+env:
+  - RAILS_VERSION=4.0.0
+  - RAILS_VERSION=4.0.5
+  - RAILS_VERSION=4.1.0
+  - RAILS_VERSION=4.1.1
+
 rvm:
   - 1.9.3-p448
   - 2.0.0-p247
   - 2.1.2
+
 before_script:
+  - sudo apt-get update
+  - sudo apt-get install postgresql-server-dev-9.1 postgresql-contrib-9.1 libtap-parser-sourcehandler-pgtap-perl
+  - git clone https://github.com/theory/pgtap.git /tmp/pgtap
+  - env PG_CONFIG=/etc/postgresql/9.1/main/postgresql.conf && export PERL5LIB=/home/travis/perl5/lib/perl5 && cd /tmp/pgtap && make && sudo make install
   - psql -c "CREATE USER dummy WITH superuser" -U postgres
   - psql -c "CREATE DATABASE dummy_test;" -U postgres
+  - psql -d dummy_test -c "CREATE EXTENSION pgtap" -U postgres
+  - sudo sed -e 's/perl \-w/perl -w -X/' -i /usr/bin/pg_prove
+  - cd -
 script:
   - script/redb
-  - bundle exec rspec spec
-  - bundle exec cucumber features
+  - bundle exec rake landable
+
+notifications:
+  # let enova know about the build
+  slack: enova:xzPNLg3AxkbkUcUlfn7sqHW5

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.7.1.rc1...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.8.0...master)
+
+## 1.8.0 [#](https://github.com/enova/landable/compare/v1.7.1.rc1...v1.8.0)
+* Removing geminabox [#11]
+* Some fixes to the DB tests [#9]
+* Rails 4.x support [#8]
+* Screenshots by revision [#7]
+* Soft deletes [#6]
 
 ## 1.7.1.rc1 [#](https://github.com/enova/landable/compare/v1.7.0...v1.7.1.rc1)
 * Allow for revisions for Templates [#3]

data/Gemfile

@@ -1,18 +1,19 @@
 source "https://rubygems.org"
 
-group :test do
-  gem "cucumber-rails", require: false
-end
-
-# Declare your gem's dependencies in landable.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+# load dependencies from landable.gemspec
 gemspec
 
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
+# allow us to load up a specific version of rails, since the gemspec is
+# concerned only with compatibility (see bin/test)
+if ENV.key? 'RAILS_VERSION'
+  gem 'rails', ENV['RAILS_VERSION']
+end
 
-# To use debugger
-# gem 'debugger'
+# development/test dependencies, and anything else that doesn't belong or fit
+# in the gemspec
+group :test do
+  gem 'minitest'
+  gem 'shoulda-matchers'
+  gem 'cucumber-rails', require: false
+  gem 'test_after_commit'
+end

data/Rakefile

@@ -7,7 +7,6 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-require "bundler_geminabox/gem_tasks"
 Bundler::GemHelper.install_tasks
 
 Dir.glob(File.expand_path('../lib/tasks/landable/*.rake', __FILE__)).each { |f| load f }

data/app/controllers/landable/api/assets_controller.rb

@@ -1,55 +1,73 @@
-require_dependency "landable/api_controller"
-require_dependency "landable/asset_search_engine"
+require_dependency 'landable/api_controller'
+require_dependency 'landable/asset_search_engine'
 
 module Landable
   module Api
     class AssetsController < ApiController
-      def index
-        search = Landable::AssetSearchEngine.new search_params.merge(ids: params[:ids])
-        respond_with search.results, meta: search.meta
-      end
-
-      def show
-        respond_with Asset.find(params[:id])
-      end
-
+      # filters
+      before_filter :load_asset, except: [:create, :index]
+      
+      # RESTful methods
       def create
-        asset = Asset.new asset_params
+        asset = Asset.new(asset_params)
 
         if original = asset.duplicate_of
           head :moved_permanently, location: asset_url(original)
           return
         end
-
+        
         Asset.transaction do
           asset.author = current_author
           asset.save!
         end
-
+        
         respond_with asset, status: :created, location: asset_url(asset)
       end
-
-      def update
-        asset = Asset.find(params[:id])
-
-        asset.update_attributes! asset_params
-
-        respond_with asset
+      
+      def destroy
+        @asset.try(:deactivate)
+        
+        respond_with @asset
+      end
+      
+      def index
+        search = Landable::AssetSearchEngine.new(search_params.merge(ids: params[:ids]))
+        respond_with search.results, meta: search.meta
       end
 
-      private
-
-      def search_params
-        @search_params ||=
-          begin
-            hash = params.permit(search: [:name])
-            hash[:search] || {}
-          end
+      def reactivate
+        @asset.try(:reactivate)
+        
+        respond_with @asset
+      end
+      
+      def show
+        respond_with @asset
       end
+      
+      def update
+        @asset.update_attributes!(asset_params)
 
-      def asset_params
-        params.require(:asset).permit(:id, :name, :description, :data, :file)
+        respond_with @asset
       end
+      
+      # custom methods
+      private
+        def asset_params
+          params.require(:asset).permit(:id, :name, :description, :data, :file)
+        end
+      
+        def load_asset
+          @asset = Asset.find(params[:id])
+        end
+      
+        def search_params
+          @search_params ||=
+            begin
+              hash = params.permit(search: [:name])
+              hash[:search] || {}
+            end
+        end
     end
   end
 end

data/app/controllers/landable/api/pages_controller.rb

@@ -1,37 +1,57 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
     class PagesController < ApiController
-      def index
-        search = Landable::PageSearchEngine.new search_params.merge(ids: params[:ids]), limit: 100
-        respond_with search.results, meta: search.meta
-      end
-
+      # filters
+      before_filter :load_page, except: [:create, :index, :preview]
+      
+      # RESTful methods
       def create
         page = Page.new page_params
         page.updated_by_author = current_author
         page.save!
+
         respond_with page, status: :created, location: page_url(page)
       end
+      
+      def destroy
+        @page.updated_by_author = current_author
+        @page.try(:deactivate)
 
-      def show
-        respond_with Page.find(params[:id])
+        respond_with @page
+      end
+      
+      def index
+        search = Landable::PageSearchEngine.new search_params.merge(ids: params[:ids]), limit: 100
+        
+        respond_with search.results, meta: search.meta
       end
 
+      def reactivate
+        @page.try(:reactivate)
+        
+        respond_with @page
+      end
+      
+      def show
+        respond_with @page
+      end
+      
       def update
-        page = Page.find params[:id]
-        page.updated_by_author = current_author
-        page.update_attributes! page_params
-        respond_with page
+        @page.updated_by_author = current_author
+        @page.update_attributes!(page_params)
+        
+        respond_with @page
       end
-
+      
+      # custom  methods
       def publish
-        page = Page.find params[:id]
-        page.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
-        respond_with page
+        @page.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
+        
+        respond_with @page
       end
-
+      
       def preview
         page  = Page.where(page_id: page_params[:id]).first_or_initialize
         page.attributes = page_params
@@ -46,51 +66,53 @@ module Landable
             content = RenderService.call(page, preview: true)
           end
         end
-
+        
         respond_to do |format|
           format.json do
             render json: {
               page: {
                 preview: content,
-                errors: page.errors,
+                errors: page.errors
               }
             }
           end
         end
       end
-
+      
       def screenshots
         Landable::ScreenshotService.call Page.find(params[:id])
 
-        # "{}" is valid json, which jquery will accept as a successful response. "" is not.
+        # '{}' is valid json, which jquery will accept as a successful response. '' is not.
         render json: {}, status: 202
       end
-
+      
       private
+        def load_page
+          @page = Page.find(params[:id])
+        end
+      
+        def search_params
+          @search_params ||=
+            begin
+              hash = params.permit(search: [:path])
+              hash[:search] || {}
+            end
+        end
+      
+        def page_params
+          params.require(:page).permit(:id, :path, :theme_id, :category_id, :title, :head_content, :body, :status_code, :redirect_url, :lock_version, :abstract, :hero_asset_name, meta_tags: [:description, :keywords, :robots])
+        end
+      
+        def with_format(format, &block)
+          old_formats = formats
 
-      def search_params
-        @search_params ||=
           begin
-            hash = params.permit(search: [:path])
-            hash[:search] || {}
+            self.formats = [format]
+            return block.call
+          ensure
+            self.formats = old_formats
           end
-      end
-
-      def page_params
-        params.require(:page).permit(:id, :path, :theme_id, :category_id, :title, :head_content, :body, :status_code, :redirect_url, :lock_version, :abstract, :hero_asset_name,
-                                     meta_tags: [:description, :keywords, :robots])
-      end
-
-      def with_format(format, &block)
-        old_formats = formats
-
-        begin
-          self.formats = [format]
-          return block.call
-        ensure
-          self.formats = old_formats
         end
-      end
     end
   end
 end

data/app/controllers/landable/api/templates_controller.rb

@@ -3,37 +3,61 @@ require_dependency "landable/api_controller"
 module Landable
   module Api
     class TemplatesController < ApiController
-      def index
-        respond_with Template.all
-      end
+      # filters
+      before_filter :load_template, except: [:create, :index]
 
+      # RESTful methods
       def create
         template = Template.new(template_params)
         template.save!
+        
         respond_with template, status: :created, location: template_url(template)
       end
 
+      def destroy
+        @template.temp_author = current_author
+        @template.try(:deactivate)
+
+        respond_with @template
+      end
+
+      def index
+        respond_with Template.all
+      end
+
       def show
-        respond_with Template.find(params[:id])
+        respond_with @template
       end
 
       def update
-        template = Template.find(params[:id])
-        template.update_attributes! template_params
-        respond_with template
+        @template.update_attributes!(template_params)
+        
+        respond_with @template
       end
 
+      # custom methods
       def publish
-        template = Template.find params[:id]
-        template.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
-        respond_with template
+        @template.publish! author_id: current_author.id, notes: params[:notes], is_minor: !!params[:is_minor]
+        
+        respond_with @template
+      end
+
+      def reactivate
+        @template.try(:reactivate)
+        
+        respond_with @template
       end
 
       private
+        def load_template
+          @template = Template.find(params[:id])
+        end
 
-      def template_params
-        params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, :slug, :is_layout, :is_publishable)
-      end
+        def template_params
+          params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, :slug, :is_layout, :is_publishable)
+        end
+
+      # end
     end
   end
 end