landable 1.9.2 → 1.10.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aa9dec4d4dea28d1713a070dda1f8896131e927
-  data.tar.gz: 97367aa585551fad6b9124616e791f9a9f229904
+  metadata.gz: 936efb7758fec888e89ca1a24b62a477bb990f3b
+  data.tar.gz: f9e57914f0247c9a285e1fa17c28073666f78487
 SHA512:
-  metadata.gz: 5e6d41e286c597c016760d815a93d6a6427cb6aed60e667ac4751860c331d9ec4654c727916305ff1bb565521dbda82ab4bf184babcba976de905945dae83027
-  data.tar.gz: 78b146382e7ed984e3d73e6df7c7d3b0149cd2a3fc40913dfbbe6930526edbaf6cffe5e7d30688601721b5468928144054ffb3cb391dd1730826f3ff6dbe456d
+  metadata.gz: 6567ba6077c5ced9c68ba5b29826fff45824b6859ed8dc58883cf9ac27da4f9daaf14d0e2e89ac899aeb0f7bf457142f9564b18d866ee16752d3bdbc9892c9b9
+  data.tar.gz: d35d0cafe6fd487ff27af1a0ec1e08a30006dd6be46ad05f0bcd80ff27e1e91cc599ad582b722d42d8d88e082e4ab966b4a87a81646a6f6239301095e6280611

data/CHANGELOG.md

@@ -2,9 +2,14 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.9.2...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.10.0.rc1...master)
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.9.1...v1.9.2)
+## 1.10.0.rc1 [#](https://github.com/enova/landable/compare/v1.9.2...v1.10.0.rc1)
+* Handle blank UserAgent [#25]
+* Make table_name.rb generic. [#22]
+* Liquid Preview Template Styling [#21]
+
+## 1.9.2 [#](https://github.com/enova/landable/compare/v1.9.1...v1.9.2)
 * Added compatibility with new Rails 4.1 JSON-based cookies [#19]
 
 ## 1.9.1 [#](https://github.com/enova/landable/compare/v1.9.0...v1.9.1)

data/README.md

@@ -41,6 +41,8 @@ Landable.configure do |config|
 end
 ```
 
+Read more about [Visit Tracking](https://github.com/enova/landable/wiki/Visit-Tracking)
+
 ## Development
 
 Run `./script/redb` to refresh the dummy app's database.

data/app/models/concerns/landable/table_name.rb

@@ -3,10 +3,12 @@ module Landable
     extend ActiveSupport::Concern 
 
     included do
+      schema = "#{Landable.configuration.database_schema_prefix}landable"
+      suffix = parent.name.demodulize.downcase
+
+      schema += "_#{suffix}" unless suffix == "landable"
       model_name = self.model_name.element.pluralize
-      schema_name = "#{Landable.configuration.database_schema_prefix}landable"
-      self.table_name = "#{schema_name}.#{model_name}"
+      self.table_name = "#{schema}.#{model_name}"
     end
-
   end
-end
+end

data/app/models/landable/traffic/access.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Access < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_for :path, class_name: Path
 

data/app/models/landable/traffic/ad_group.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class AdGroup < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :ad_group, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/ad_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class AdType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :ad_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/attribution.rb

@@ -1,7 +1,8 @@
 module Landable
   module Traffic
     class Attribution < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
+
       KEYS = %w[ad_type ad_group bid_match_type campaign content creative device_type experiment keyword match_type medium network placement position search_term source target]
 
       self.record_timestamps = false

data/app/models/landable/traffic/bid_match_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class BidMatchType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :bid_match_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/browser.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Browser < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :browser, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/campaign.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Campaign < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :campaign, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/city.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class City < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :city, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/content.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Content < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :content, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/cookie.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Cookie < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :cookie_id, cache: 100, find: true
 

data/app/models/landable/traffic/country.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Country < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :country, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/creative.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Creative < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :creative, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/device.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Device < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :device, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/device_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class DeviceType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :device_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/domain.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Domain < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :domain, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/event.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Event < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
       self.record_timestamps = false
 
       lookup_for :event_type, class_name: EventType, symbolize: true

data/app/models/landable/traffic/event_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class EventType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :event_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/experiment.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Experiment < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :experiment, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/http_method.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class HTTPMethod < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :http_method, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/ip_address.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class IpAddress < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :ip_address, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/ip_lookup.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class IpLookup < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_for :ip_address, class_name: IpAddress
       lookup_for :domain,     class_name: Domain

data/app/models/landable/traffic/keyword.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Keyword < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :keyword, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/location.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Location < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_for :country, class_name: Country
       lookup_for :region,  class_name: Region

data/app/models/landable/traffic/match_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class MatchType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :match_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/medium.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Medium < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :medium, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/mime_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class MimeType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :mime_type, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/network.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Network < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :network, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/owner.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Owner < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       has_many :ownerships
       has_many :visits

data/app/models/landable/traffic/ownership.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Ownership < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       belongs_to :cookie
       belongs_to :owner

data/app/models/landable/traffic/page_view.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class PageView < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
       self.record_timestamps = false
 
       belongs_to :visit

data/app/models/landable/traffic/path.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Path < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :path, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/placement.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Placement < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :placement, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/platform.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Platform < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :platform, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/position.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Position < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :position, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/query_string.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class QueryString < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :query_string, cache: 50, find_or_create: true, allow_blank: true
 

data/app/models/landable/traffic/referer.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Referer < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_for :domain,       class_name: Domain
       lookup_for :path,         class_name: Path

data/app/models/landable/traffic/region.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Region < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :region, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/search_term.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class SearchTerm < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :search_term, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/source.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Source < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :source, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/target.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Target < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :target, cache: 50, find_or_create: true
 

data/app/models/landable/traffic/user_agent.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class UserAgent < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
       self.record_timestamps = false
 
       lookup_by  :user_agent, cache: 50, find_or_create: true

data/app/models/landable/traffic/user_agent_type.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class UserAgentType < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_by :user_agent_type, cache: true
 

data/app/models/landable/traffic/visit.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Visit < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
       self.record_timestamps = false
 
       belongs_to :attribution

data/app/models/landable/traffic/visitor.rb

@@ -1,7 +1,7 @@
 module Landable
   module Traffic
     class Visitor < ActiveRecord::Base
-      include Landable::Traffic::TableName
+      include Landable::TableName
 
       lookup_for :ip_address, class_name: IpAddress
       lookup_for :user_agent, class_name: UserAgent

data/app/views/templates/preview.liquid

@@ -84,19 +84,15 @@
 {% else %}
   <!-- pretty invalid, this is -->
   <style type="text/css">
-    body {
-      padding-top: 30px;
-    }
-
     body:before {
       width: 100%;
-      position: absolute;
+      position: fixed;
       top: 0;
-      left: 0;
+      right: 0;
       box-sizing: border-box;
       box-shadow: inset 0 -10px 5px -10px rgba(0, 0, 0, 0.5);
       height: 30px;
-      padding: 5px 0;
+      padding: 5px 20px;
       background-color: #FFDA73;
       line-height: 20px;
       font-size: 14px;
@@ -106,6 +102,7 @@
       color: #7e592d;
       content: "Preview Mode";
       text-transform: uppercase;
+	  z-index: 1000000;
     }
 
     body.publicist-preview {

data/config/routes.rb

@@ -2,7 +2,6 @@ Landable::Engine.routes.draw do
   scope path: Landable.configuration.api_namespace, module: 'api' do
     resources :access_tokens, only: [:create, :update, :destroy]
     resources :categories, only: [:index, :show]
-    resources :status_codes, only: [:index]
 
     resources :directories, only: [:index, :show], constraints: {
       id: /[%a-zA-Z0-9\/_.~-]*/

data/lib/generators/templates/landable.rb

@@ -31,6 +31,9 @@ Landable.configure do |config|
 
   # Where is your site deployed? (required for screenshots)
   # config.public_url = 'http://myapp.dev/'
+
+  # If you want to save a different UserAgent if the request.user_agent is blank, set it here
+  # config.blank_user_agent_string = 'blank'
 end
 
 # Configure asset uploads. Assets will be uploaded to public/uploads by default.

data/lib/landable/configuration.rb

@@ -9,6 +9,7 @@ module Landable
     attr_writer :sitemap_exclude_categories, :sitemap_protocol, :sitemap_host, :sitemap_additional_paths
     attr_writer :reserved_paths, :partials_to_templates, :database_schema_prefix
     attr_writer :publicist_url, :audit_flags
+    attr_writer :blank_user_agent_string
 
     def authenticators
       @authenticators || raise("No Landable authenticator configured.")
@@ -140,6 +141,10 @@ module Landable
       @screenshots ||= Screenshots.new
     end
 
+    def blank_user_agent_string
+      @blank_user_agent_string ||= 'blank'
+    end
+
     class Screenshots
       attr_accessor :autorun
       attr_accessor :browserstack_username, :browserstack_password

data/lib/landable/traffic.rb

@@ -9,6 +9,7 @@ require 'landable/traffic/noop_tracker'
 module Landable
   module Traffic
     def track_with_landable!
+      yield and return if request.headers["DNT"]
       begin
         @tracker = Tracker.for self
         @tracker.track

data/lib/landable/traffic/tracker.rb

@@ -157,7 +157,7 @@ module Landable
       end
 
       def user_agent
-        @user_agent ||= UserAgent[request.user_agent]
+        @user_agent ||= UserAgent[request_user_agent]
       end
 
       def referer
@@ -183,7 +183,7 @@ module Landable
       end
 
       def visitor_hash
-        Digest::SHA2.base64digest [remote_ip, request.user_agent].join
+        Digest::SHA2.base64digest [remote_ip, request_user_agent].join
       end
 
       def referer_hash
@@ -290,6 +290,11 @@ module Landable
       def visit
         @visit ||= @visit_id && Visit.find(@visit_id)
       end
+
+      def request_user_agent
+        return Landable.configuration.blank_user_agent_string if request.user_agent.blank?
+        request.user_agent
+      end
     end
   end
 end

data/lib/landable/version.rb

@@ -1,9 +1,9 @@
 module Landable
   module VERSION
     MAJOR = 1
-    MINOR = 9
-    PATCH = 2
-    PRE   = nil
+    MINOR = 10
+    PATCH = 0
+    PRE   = 'rc1'
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0.rc1
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,7 +332,6 @@ files:
 - app/models/concerns/landable/has_templates.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
 - app/models/landable/asset.rb
 - app/models/landable/asset_search_engine.rb
@@ -660,12 +659,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Mountable CMS engine for Rails

data/app/models/concerns/landable/traffic/table_name.rb

@@ -1,14 +0,0 @@
-module Landable
-  module Traffic
-    module TableName
-      extend ActiveSupport::Concern 
-
-      included do
-        model_name = self.model_name.element.pluralize
-        schema_name = "#{Landable.configuration.database_schema_prefix}landable_traffic"
-        self.table_name = "#{schema_name}.#{model_name}"
-      end
-
-    end
-  end
-end