cackle 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c203cde289fd456717fc18b216f13b58c00bec2b
-  data.tar.gz: e9981d7f891a64e081047896111e7948aa37315c
+  metadata.gz: 844460572c907e5a7458a7adc04514299fdc0f01
+  data.tar.gz: 54dc75cd452cece5f05aea8533aea73b96318deb
 SHA512:
-  metadata.gz: c6f6567432e1aba96aa01985679660e378528cf33e2d4700b883ee5099a19b5e7680e0d1e26e465bbd50047779b7f2618e7860f5fd0cc901b6248ef35cd5b246
-  data.tar.gz: 1e22c05051f38bbdaff1066f3938e87d32aa64b7dae097f8c5bbd7ed709ece104185f1e1d471350c11a370d925ac288c9339bf58b70f67db8cde0de90ab41e95
+  metadata.gz: 16b8e123afdef37d21a3071be47d1a057c93c6e67833e489eaf37131551ceb011437a7802dd72fedf3d870bb77663effe206b55eb496d1508b791b0525280d99
+  data.tar.gz: b5ff68f9e5ea51e398090845f5c1269b4b61c57ecc53f273636b90c9b773ecf69517d26e456c999869f8aef052473ae0828e74f807c9397f414191087d68e570

data/README.md

@@ -35,12 +35,6 @@ See http://cackle.me/help/comment-sync to find your keys
 site_id:         12345          # Site ID
 site_api_key:    blah-blah-blah # Account API Key
 account_api_key: blah-blah-blah # Site API Key  
-
-recent:                         # configuretion for recent comments block
-  mcSize:        10             # how many comments to display
-  mcAvatarSize:  32             # size of avatar image in pixels
-  mcTextSize:    150            # length of message block if more shorten with '...'
-  mcTitleSize:   40             # title length
 ```
 
 Helper methods
@@ -52,7 +46,11 @@ cackle_comments
 ```
 Recent comments widget
 ```ruby
-cackle_recent_comments 
+cackle_recent_comments
+```
+You can easily specify ammount of comments to show and other params. For example:
+```ruby
+cackle_recent_comments 10, avatar_size: 32, text_size: 150, title_size: 40 
 ```
 
 Rake tasks

data/lib/app/helpers/cackle_helper.rb

@@ -1,18 +1,15 @@
 module CackleHelper
   def cackle_comments
-    load_config
+    @config ||= YAML::load(File.open('config/cackle.yml'))
     @comments = CackleComment.approved.where("url LIKE ?", "%#{request.path}")
     render template: 'cackle/comments'
   end
   
-  def cackle_recent_comments
-    load_config
-    @comments = CackleComment.approved.limit(@config['recent']['mcSize'])
-    render template: 'cackle/recent'
-  end
-  
-  private 
-  def load_config
-    @config ||= YAML::load(File.open('config/cackle.yml'))
+  def cackle_recent_comments count=10, options={}
+    options[:avatar_size] ||= 32
+    options[:text_size]   ||= 150
+    options[:title_size]  ||= 40
+    @comments = CackleComment.approved.limit(count)
+    render template: 'cackle/recent', locals: { options: options }
   end
 end

data/lib/app/models/cackle_comment.rb

@@ -1,5 +1,5 @@
 class CackleComment < ActiveRecord::Base
   self.primary_key = 'comment_id'
-  default_scope order: 'created_at DESC'
+  default_scope       { order('created_at DESC') }
   scope :approved, -> { where(status: 'approved') }
 end

data/lib/app/views/cackle/recent.html.haml

@@ -16,8 +16,8 @@
   #mc-link{color:#555!important;font-size:11px!important;clear:both!important;float:right;text-decoration:none!important}
   #mc-link:hover{color:#333!important}
   .mc-recent-thumb img{
-    width: #{@config['recent']['mcAvatarSize']}px;
-    height: #{@config['recent']['mcAvatarSize']}px;
+    width: #{options[:avatar_size]}px;
+    height: #{options[:avatar_size]}px;
   } 
 #mc-last
   .mc-last-content
@@ -37,9 +37,9 @@
                     %span.mc-recent-author= comment.author_name
                 - else
                   %span.mc-recent-author= comment.anonym_name
-              %p.mc-recent-text= link_to comment.message.truncate(@config['recent']['mcTextSize']), comment.url + "#mc-#{comment.id}"
+              %p.mc-recent-text= link_to comment.message.truncate(options[:text_size]), comment.url + "#mc-#{comment.id}"
               %p.mc-recent-meta
-                = link_to comment.title.truncate(@config['recent']['mcTitleSize']), comment.url, title: comment.title
+                = link_to comment.title.truncate(options[:title_size]), comment.url, title: comment.title
                 - unless 1.month.ago > (date = comment.created_at)
                   · #{time_ago_in_words date} назад 
                 - else

data/lib/cackle/version.rb

@@ -1,3 +1,3 @@
 module Cackle
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cackle
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Artyom Nikolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement