haml-i18n-extractor 0.5.8 → 0.5.9

data/README.md

@@ -40,70 +40,111 @@ This should be a before and after picture of using this lib, whether using the n
 - Before running (old haml):
 
 <pre>
-  shai@comp ~/p/project master $ cat app/views/admin/notifications/index.html.haml
-  %h1 Consumer Notifications
-
-  .nav= will_paginate(@consumer_notifications)
-  %table.themed{cellspacing: 0}
-    %thead
-      %tr
-        %th.first Type
-        %th Identifier
-        %th Data
-        %th Success
-        %th Reported To
-    - @consumer_notifications.each do |cn|
-      %tr
-        %td.type= cn.notification.type
-        %td.identifier= cn.notification.identifier
-        %td.data= cn.notification.data
-        %td.success= cn.success
-        %td.reported_to= cn.reported_to
-  .nav= will_paginate(@consumer_notifications)
+
+shai@comp $ cat /tmp/foo.haml
+
+= render :partial => "layouts/adminnav", :locals => {:account => nil }
+.row
+  .admin.span12
+    %h1
+      Billing Month
+      = @billing_month.display_name
+
+    %h3
+      All Invoices Billable?
+      %span{:style => (@billable_invoices == @active_invoices) ? "color: #090" : "color: #900"}
+        = "#{@billable_invoices} out of #{@active_invoices}"
+    %h3
+      24 hours past end of billing month?
+      %span{:style => (@billing_month.past_cutoff) ? "color: #090" : "color: #900"}
+        = @billing_month.past_cutoff
+
+    - if @billing_month.open?
+      - if @billing_month.past_cutoff && (@billable_invoices == @active_invoices)
+        = form_for @billing_month, :url => close_admin_billing_month_url(@billing_month), :method => "POST" do |f|
+          = f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'
+      - else
+        %p
+          Billing Month cannot be closed yet.
+      %p
+        Closing the billing month will mark all the invoices as "Posted".
+      %p
+        After closing you will need to do a payment run to charge all the affected customers for the amounts due in posted invoices.
+    - elsif @billing_month.closing?
+      Month is currently closing (reload to check if it's done)
+    - elsif @billing_month.closed?
+      Month is closed
 </pre>
 
 - After running (new haml, new yaml):
 
-Note how some of the strings are replaced, and the ones that shouldn't, aren't. Yup. Beautiful, for 2 and half seconds of work, right?
+running this:
 
-Haml:
+`shai@comp /tmp $ haml-i18n-extractor foo.haml -n -y en.yml`
+
+Should give you the below...
+
+Note how some of the strings are replaced, and the ones that shouldn't, aren't. Yup. Beautiful, for 2 and half seconds of work, right?
 
 <pre>
-  shai@comp ~/p/project master $ cat app/views/admin/notifications/index.html.i18n-extractor.haml 
-  %h1= t('.consumer_notifications')
-
-  .nav= will_paginate(@consumer_notifications)
-  %table.themed{cellspacing: 0}
-    %thead
-      %tr
-        %th.first= t('.type')
-        %th= t('.identifier')
-        %th= t('.data')
-        %th= t('.success')
-        %th= t('.reported_to')
-    - @consumer_notifications.each do |cn|
-      %tr
-        %td.type= cn.notification.type
-        %td.identifier= cn.notification.identifier
-        %td.data= cn.notification.data
-        %td.success= cn.success
-        %td.reported_to= cn.reported_to
-  .nav= will_paginate(@consumer_notifications)
+
+shai@comp $ cat /tmp/foo.haml
+
+= render :partial => "layouts/adminnav", :locals => {:account => nil }
+.row
+  .admin.span12
+    %h1
+      = t('.billing_month')
+      = @billing_month.display_name
+
+    %h3
+      = t('.all_invoices_billable')
+      %span{:style => (@billable_invoices == @active_invoices) ? "color: #090" : "color: #900"}
+        =t('.billable_invoices_out_of_activ', :billable_invoices => (@billable_invoices), :active_invoices => (@active_invoices))
+    %h3
+      = t('.24_hours_past_end_of_billing_m')
+      %span{:style => (@billing_month.past_cutoff) ? "color: #090" : "color: #900"}
+        = @billing_month.past_cutoff
+
+    - if @billing_month.open?
+      - if @billing_month.past_cutoff && (@billable_invoices == @active_invoices)
+        = form_for @billing_month, :url => close_admin_billing_month_url(@billing_month), :method => "POST" do |f|
+          = f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'
+      - else
+        %p
+          = t('.billing_month_cannot_be_closed')
+      %p
+        = t('.closing_the_billing_month_will')
+      %p
+        = t('.after_closing_you_will_need_to')
+    - elsif @billing_month.closing?
+      = t('.month_is_currently_closing_rel')
+    - elsif @billing_month.closed?
+      = t('.month_is_closed')
 </pre>
 
 Yaml:
 
 <pre>
-  shai@comp ~/p/project master $ cat config/locales/en.yml
-  ---
-  en:
-    notifications:
-      consumer_notifications: Consumer Notifications
-      type: Type
-      identifier: Identifier
-      data: Data
-      success: Success
-      reported_to: Reported To
+
+shai@comp $ cat /tmp/en.yml
+
+---
+en:
+  tmp:
+    foo:
+      billing_month: Billing Month
+      all_invoices_billable: All Invoices Billable?
+      billable_invoices_out_of_activ: ! ' "%{billable_invoices} out of %{active_invoices}"'
+      24_hours_past_end_of_billing_m: 24 hours past end of billing month?
+      billing_month_cannot_be_closed: Billing Month cannot be closed yet.
+      closing_the_billing_month_will: Closing the billing month will mark all the
+        invoices as "Posted".
+      after_closing_you_will_need_to: After closing you will need to do a payment
+        run to charge all the affected customers for the amounts due in posted invoices.
+      month_is_currently_closing_rel: Month is currently closing (reload to check
+        if it's done)
+      month_is_closed: Month is closed
 </pre>
 
 

data/lib/haml-i18n-extractor/extraction/finder/exception_finder.rb

@@ -3,20 +3,38 @@ module Haml
     class Extractor
       class ExceptionFinder
 
-        def initialize(text)
-          @text = text
-        end
-
         LINK_TO_REGEX_DOUBLE_Q = /link_to\s*\(?\s*["](.*?)["]\s*,\s*(.*)\)?/
         LINK_TO_REGEX_SINGLE_Q = /link_to\s*\(?\s*['](.*?)[']\s*,\s*(.*)\)?/
         LINK_TO_BLOCK_FORM_SINGLE_Q = /link_to\s*\(?['](.*?)[']\)?.*\sdo\s*$/
         LINK_TO_BLOCK_FORM_DOUBLE_Q = /link_to\s*\(?["](.*?)["]\)?.*\sdo\s*$/
         LINK_TO_NO_QUOTES = /link_to\s*\(?([^'"]*?)\)?.*/
 
+        FORM_SUBMIT_BUTTON_SINGLE_Q = /[a-z]\.submit\s?['](.*?)['].*$/
+        FORM_SUBMIT_BUTTON_DOUBLE_Q = /[a-z]\.submit\s?["](.*?)["].*$/
+
         # this class simply returns text except for anything that matches these regexes.
         # returns first match.
         EXCEPTION_MATCHES = [ LINK_TO_BLOCK_FORM_DOUBLE_Q, LINK_TO_BLOCK_FORM_SINGLE_Q,
-                              LINK_TO_REGEX_DOUBLE_Q, LINK_TO_REGEX_SINGLE_Q , LINK_TO_NO_QUOTES ]
+                              LINK_TO_REGEX_DOUBLE_Q, LINK_TO_REGEX_SINGLE_Q , LINK_TO_NO_QUOTES,
+                              FORM_SUBMIT_BUTTON_SINGLE_Q, FORM_SUBMIT_BUTTON_DOUBLE_Q]
+
+
+        def initialize(text)
+          @text = text
+        end
+
+        def self.could_match_script?(txt)
+          # want to match:
+          # = 'foo'
+          # = "foo"
+          # = link_to 'bla'
+          #
+          # but not match:
+          # = ruby_var = 2
+          scanner = StringScanner.new(txt)
+          scanner.scan(/\s+/)
+          scanner.scan(/['"]/) || EXCEPTION_MATCHES.any? {|regex| txt.match(regex) }
+        end
 
         def find
           ret = @text

data/lib/haml-i18n-extractor/extraction/finder/text_finder.rb

@@ -55,7 +55,7 @@ module Haml
 
         def script(line)
           txt = line[:value][:text]
-          if could_match_script?(txt)
+          if ExceptionFinder.could_match_script?(txt)
             FinderResult.new(:script, ExceptionFinder.new(txt).find)
           else
             FinderResult.new(:script, "")

data/lib/haml-i18n-extractor/helpers.rb

@@ -49,18 +49,6 @@ module Haml
             txt.match(/link_to/) || txt.match(/^\s*['"]/) # %element= 'foo'
           end
 
-          def could_match_script?(txt)
-            # want to match:
-            # = 'foo'
-            # = "foo"
-            # = link_to 'bla'
-            #
-            # but not match:
-            # = ruby_var = 2
-            scanner = StringScanner.new(txt)
-            scanner.scan(/\s+/)
-            scanner.scan(/['"]/) || scanner.scan(/link_to/)
-          end
         end
 
         module Highline

data/lib/haml-i18n-extractor/version.rb

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.5.8"
+      VERSION = "0.5.9"
     end
   end
 end

data/test/exception_finder_test.rb

@@ -19,7 +19,8 @@ module Haml
       %{link_to("TEXT"), role: 'button', data: {toggle: 'dropdown'} do} => "TEXT",
       %{link_to   "TEXT", role: 'button', data: {toggle: 'dropdown'} do} => "TEXT",
       %{link_to pending_account_invoices_path(account) do} => "",
-      %{link_to(pending_account_invoices_path(account),"http://random")} => ""
+      %{link_to(pending_account_invoices_path(account),"http://random")} => "",
+      %{f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'} => "Close This Month (cannot be undone)"
     }
 
     def test_it_finds_text_pretty_simply

data/test/support/ex2.output.haml

@@ -17,7 +17,7 @@
     - if @billing_month.open?
       - if @billing_month.past_cutoff && (@billable_invoices == @active_invoices)
         = form_for @billing_month, :url => close_admin_billing_month_url(@billing_month), :method => "POST" do |f|
-          = f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'
+          = f.submit t('.close_this_month_cannot_be_und'), :class => 'btn btn-primary'
       - else
         %p
           = t('.billing_month_cannot_be_closed')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-15 00:00:00 Z
+date: 2013-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt