landable 1.7.1.rc1 → 1.8.0

data/script/pgtap

@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ../db/test && pg_prove -d dummy_test *.sql > output.txt
+cat output.txt
+TMP=`cat output.txt | grep "All tests successful." | awk '{ print $1 }'`
+
+if [ "$TMP" = "All" ]; then
+  exit 0
+else
+  exit 1
+fi

data/script/redb

@@ -1,6 +1,4 @@
 #!/bin/sh
-rm spec/dummy/db/structure.sql
-
 bundle exec rake app:db:drop:all
 bundle exec rake app:db:create:all
 bundle exec rake app:db:migrate

data/spec/concerns/landable/librarian.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Landable
+  # descriptions
+  describe Librarian do
+    # setup
+    before do
+      @page = create(:page)
+    end
+
+    # tests
+    it "should soft delete a content managed Item" do
+      # setup
+      current_page = Page.find(@page.id)
+      
+      # actions
+      current_page.deactivate
+
+      # expectations
+      expect(current_page).to be_a Page
+      expect(current_page.deleted_at).to_not be_blank
+      
+      # end
+    end
+
+    it "should restore a content managed Item" do
+      # setup
+      Page.find(@page.id).deactivate
+      restored_page = Page.find(@page.id)
+
+      # actions
+      restored_page.reactivate
+
+      # expectations
+      expect(restored_page).to be_a Page
+      expect(restored_page.deleted_at).to be_blank
+
+      # end
+    end
+
+    # end
+  end
+
+  # end
+end

data/spec/controllers/public/preview/pages_controller_spec.rb

@@ -24,7 +24,7 @@ module Landable::Public::Preview
 
       it 'renders the preview message' do
         make_request
-        response.body.should include 'Test your unpublished changes with this page. Share this URL!'
+        response.body.should include 'Preview Mode'
       end
 
       it 'is available at /-/p/:id' do

data/spec/models/landable/page_revision_spec.rb

@@ -66,8 +66,66 @@ module Landable
 
     describe '#preview_url' do
       it 'should return the preview url' do
-        revision.should_receive(:public_preview_page_revision_url) { 'foo' }
-        revision.preview_url.should == 'foo'
+        Landable.configuration.stub(:public_host) { 'foo' }
+        revision.should_receive(:public_preview_page_revision_url).with(revision, host: 'foo') { 'bar' }
+        revision.preview_url.should == 'bar'
+      end
+    end
+
+    describe '#add_screenshot!' do
+      let(:screenshots_enabled) { true }
+
+      before(:each) do
+        Landable.configuration.stub(:screenshots_enabled) { screenshots_enabled }
+      end
+
+      it 'should be fired before create' do
+        revision.should_receive :add_screenshot!
+        revision.save!
+      end
+
+      it 'should add a screenshot' do
+        screenshot = double('screenshot')
+
+        revision.stub(:preview_url) { 'http://google.com/foo' }
+        ScreenshotService.should_receive(:capture).with(revision.preview_url) { screenshot }
+
+        revision.should_receive(:screenshot=).with(screenshot).ordered
+        revision.should_receive(:store_screenshot!).ordered
+        revision.should_receive(:write_screenshot_identifier).ordered
+        revision.should_receive(:update_column).with(:screenshot, revision[:screenshot]).ordered
+
+        revision.add_screenshot!
+      end
+
+      context 'screenshots disabled' do
+        let(:screenshots_enabled) { false }
+
+        it 'should skip' do
+          revision.should_receive(:add_screenshot!).and_call_original
+          ScreenshotService.should_not_receive :capture
+          revision.should_not_receive :screenshot=
+
+          revision.save!
+        end
+      end
+    end
+
+    describe '#screenshot_url' do
+      context 'with screenshot' do
+        it 'should return the screenshot url' do
+          screenshot = double('screenshot', url: 'foobar')
+
+          revision.stub(:screenshot) { screenshot }
+          revision.screenshot_url.should == screenshot.url
+        end
+      end
+
+      context 'without screenshot' do
+        it 'should return nil' do
+          revision.stub(:screenshot) { nil }
+          revision.screenshot_url.should be_nil
+        end
       end
     end
 

data/spec/models/landable/page_spec.rb

@@ -112,7 +112,9 @@ module Landable
       specify "quacks like a Hash" do
         # Note the change from symbol to string; thus, always favor strings.
         page = create :page, meta_tags: { keywords: 'foo' }
-        page.meta_tags.keys.should == [:keywords]
+
+        # rails 4.0 preserves the symbol for this instance; rails 4.1 switches straight to strings
+        page.meta_tags.keys.map(&:to_s).should == ['keywords']
 
         tags = Page.first.meta_tags
         tags.should be_a(Enumerable)

data/spec/services/landable/authentication_service_spec.rb

@@ -14,7 +14,7 @@ describe Landable::AuthenticationService do
   end
 
   before do
-    Landable.configuration.stub!(authenticators: [simple_auth, echo_auth])
+    Landable.configuration.stub(authenticators: [simple_auth, echo_auth])
   end
 
   it "returns the result of the first successful authentication strategy" do

data/spec/services/landable/screenshot_service_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Landable
+  describe ScreenshotService do
+    let(:publicist_url) { nil }
+    let(:screenshot_url) { 'http://google.com/asdf' }
+    let(:screenshot_content) { 'screenshot-content' }
+
+    before(:each) do
+      Landable.configuration.stub(:publicist_url) { publicist_url }
+    end
+
+    describe '#capture' do
+      context 'with configured publicist url' do
+        let(:publicist_url) { 'http://publicist.foo/' }
+
+        it 'should return a file pointer to the downloaded screenshot' do
+          Net::HTTP.should_receive(:post_form) do |uri, params|
+            uri.to_s.should == 'http://publicist.foo/api/services/screenshots'
+            params.should == {'screenshot[url]' => screenshot_url}
+
+            double('response', code: '200', content_type: 'image/png', body: screenshot_content)
+          end
+
+          screenshot = ScreenshotService.capture screenshot_url
+
+          screenshot.should be_a Tempfile
+          screenshot.read.should == screenshot_content
+        end
+      end
+
+      context 'without configured publicist url' do
+        it 'should return nil with a warning' do
+          Net::HTTP.should_not_receive(:post_form)
+
+          Rails.logger.should_receive(:warn).with(/#{screenshot_url}/)
+
+          ScreenshotService.capture(screenshot_url).should be_nil
+        end
+      end
+    end
+  end
+end

data/spec/services/landable/tidy_service_spec.rb

@@ -100,9 +100,10 @@ module Landable
             $?.should_receive(:exitstatus) { 1 }
 
             # meh, shouldn't have to do this. could use a refactor.
-            service.should_receive(:wrap_liquid) { |input| input }
+            service.should_receive(:wrap_liquid)   { |input| input }
+            service.should_receive(:unwrap_liquid) { |input| input }
 
-            expect { service.call('<div>foo</div>', raise_on_error: true) }.to_not raise_error TidyService::TidyError
+            expect { service.call('<div>foo</div>', raise_on_error: true) }.not_to raise_error
           end
         end
       end

metadata

@@ -1,195 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.7.1.rc1
+  version: 1.8.0
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lookup_by
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
@@ -210,14 +196,14 @@ dependencies:
   name: rack-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -226,96 +212,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.14
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: valid_attribute
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler_geminabox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Landing page storage, rendering, tracking, and management API
@@ -325,9 +297,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rbenv-gemsets
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -354,6 +327,7 @@ files:
 - app/helpers/landable/application_helper.rb
 - app/helpers/landable/pages_helper.rb
 - app/models/concerns/landable/has_assets.rb
+- app/models/concerns/landable/librarian.rb
 - app/models/concerns/landable/table_name.rb
 - app/models/concerns/landable/traffic/table_name.rb
 - app/models/landable/access_token.rb
@@ -428,6 +402,7 @@ files:
 - app/services/landable/authentication_service.rb
 - app/services/landable/registration_service.rb
 - app/services/landable/render_service.rb
+- app/services/landable/screenshot_service.rb
 - app/services/landable/tidy_service.rb
 - app/uploaders/landable/asset_uploader.rb
 - app/validators/path_validator.rb
@@ -457,12 +432,18 @@ files:
 - db/migrate/20140220170324_add_slug_to_categories.rb
 - db/migrate/20140220174630_add_abstract_and_hero_asset_to_pages_and_page_revisions.rb
 - db/migrate/20140224205516_rename_traffic_schema.rb
+- db/migrate/20140501171345_add_deleted_at_to_pages.rb
+- db/migrate/20140501171352_add_deleted_at_to_themes.rb
+- db/migrate/20140501171359_add_deleted_at_to_assets.rb
+- db/migrate/20140501171406_add_deleted_at_to_templates.rb
 - db/migrate/20140509190128_create_template_revisions.rb
+- db/migrate/20140515164543_add_screenshot_to_page_revisions.rb
 - db/pgtap/pgtap.sql
 - db/test/landable.access_tokens.sql
 - db/test/landable.assets.sql
 - db/test/landable.authors.sql
 - db/test/landable.categories.sql
+- db/test/landable.general.sql
 - db/test/landable.page_revisions.sql
 - db/test/landable.pages.sql
 - db/test/landable.templates.sql
@@ -501,7 +482,6 @@ files:
 - features/step_definitions/theme_steps.rb
 - features/support/env.rb
 - features/support/usefulness.rb
-- landable-1.7.0.gem
 - landable.gemspec
 - lib/generators/landable/collection/collection_generator.rb
 - lib/generators/landable/collection/templates/stylesheets/landable/%file_name%.less
@@ -546,9 +526,11 @@ files:
 - lib/tasks/landable/spec.rake
 - lib/tasks/landable/template.rake
 - script/cucumber
+- script/pgtap
 - script/rails
 - script/redb
 - spec/concerns/landable/has_assets_spec.rb
+- spec/concerns/landable/librarian.rb
 - spec/concerns/landable/table_name_spec.rb
 - spec/concerns/landable/traffic/table_name_spec.rb
 - spec/controllers/concerns/landable/variables_concern_spec.rb
@@ -600,7 +582,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/structure.sql
+- spec/dummy/db/.keep
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -640,6 +622,7 @@ files:
 - spec/routing/public_page_route_spec.rb
 - spec/services/landable/authentication_service_spec.rb
 - spec/services/landable/render_service_spec.rb
+- spec/services/landable/screenshot_service_spec.rb
 - spec/services/landable/tidy_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/behaviors.rb
@@ -656,17 +639,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Mountable CMS engine for Rails
@@ -696,6 +679,7 @@ test_files:
 - features/support/env.rb
 - features/support/usefulness.rb
 - spec/concerns/landable/has_assets_spec.rb
+- spec/concerns/landable/librarian.rb
 - spec/concerns/landable/table_name_spec.rb
 - spec/concerns/landable/traffic/table_name_spec.rb
 - spec/controllers/concerns/landable/variables_concern_spec.rb
@@ -747,7 +731,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/structure.sql
+- spec/dummy/db/.keep
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -787,6 +771,7 @@ test_files:
 - spec/routing/public_page_route_spec.rb
 - spec/services/landable/authentication_service_spec.rb
 - spec/services/landable/render_service_spec.rb
+- spec/services/landable/screenshot_service_spec.rb
 - spec/services/landable/tidy_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/behaviors.rb