angular_rails_seo 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae62160999d4faf93f64a4cb5ed3f7df5b644997
-  data.tar.gz: 8b49bb808e37d281248643b54b7d0c721807238c
+  metadata.gz: 0b6ef66e28473ee46f95eb848316c3a7b19dcca1
+  data.tar.gz: 42be14f0827ea58796788122fea5d98e86facf88
 SHA512:
-  metadata.gz: 6b052334c586bf2b2f70eb2b96bea58dfcdaf2651471d851be88509ec13d0862ab291b8978e158284d66d1b4cf53796ac0ca7659246d29a0cb34b53fa4d17f19
-  data.tar.gz: 0b68b3578060104a6626b1e255666181796f9d5c5c14c2461b89df0dc047e0befe354942b2191934a61307a4d69824199aa1b3c1404230de08ef361255fecb4a
+  metadata.gz: 2b064d5da97630dd942c915db3e769fdf18a94880a358356f7763c034db9ff3e30b0404fe0979efed76ff67ce4522d5365b8a0926cc76c9df82980709757753b
+  data.tar.gz: cb8c6e37088dfc990a8e4138fc3e5aea1d98f096d435dd7db00af1276e21c5bbb8621c2d4489ec98224ca8357bc8a10ca36cd31a7b4b17054c5c3df4d5fb7be0

data/app/assets/javascripts/angular-rails-seo.js.erb

@@ -12,7 +12,7 @@ angular.module('angular-rails-seo', [])
 
       // Applies the passed SEO hash to the current page
       $seo.applyData = function(data) {
-        if (!data.exclude) {
+        if (!data.exclude && data.title != null) {
           $seo.setTitle(data.title);
         }
       };

data/lib/angular_rails_seo/version.rb

@@ -1,3 +1,3 @@
 module AngularRailsSeo
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/lib/angular_rails_seo/view_helpers.rb

@@ -2,21 +2,51 @@ module AngularRailsSeo
   module ViewHelpers
 
     ##
-    # Returns SEO data as defined in initializes/seo.rb
+    # Returns SEO data as defined in in seo.json
     def seo_data
-      Rails.configuration.seo.each do |key, value|
-        unless Regexp.new(value["regex"]).match(request.path).nil?
-          return seo_default.merge(Rails.configuration.seo[key])
+      if @seo_data.nil?
+        Rails.configuration.seo.each do |key, value|
+          regex = Regexp.new(value["regex"]).match(request.path)
+
+          unless regex.nil?
+            data = Rails.configuration.seo[key]
+            fallback = data["parent"].blank? ? seo_default : seo_default.merge(Rails.configuration.seo[data["parent"]])
+
+            unless data["model"].blank?
+              response = seo_dynamic(data["model"])
+              data = response.nil? ? {} : response
+            end
+
+            @seo_data = fallback.merge(data)
+          end
         end
       end
 
-      seo_default
+      @seo_data ||= seo_default
     end
 
     def seo_default
       Rails.configuration.seo["default"]
     end
 
+    def seo_dynamic(class_name)
+      begin
+        klass = class_name.constantize
+      rescue
+        logger.warn "SEO: unable to retrieve SEO data for #{class_name}"
+        return nil
+      end
+
+      begin
+        response = klass.send_method(:seo_match, regex[1..(regex.size - 1)])
+      rescue
+        logger.warn "SEO: couldn't call seo_match method of #{class_name}"
+        return nil
+      end
+
+      return response
+    end
+
     ##
     # Author meta tags
     def seo_meta_author

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: angular_rails_seo
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Ellis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement