social_snippet 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjJkOWViMTBkNjE5NDJiMTEzN2I1MTkwMjRiOTkxMjY0NzdiYzY5ZQ==
+    MThiMzVkNmUyMjI0MjdhY2M4ZmU3YjM4OWZlM2Y1MzIyYjQzYjc3MQ==
   data.tar.gz: !binary |-
-    MWM0MGM0ZjYxOTc1OTI5MmU4MmI0MDkyM2RmZDU2MTMyM2FiOWU5Mw==
+    Njk0NzQzZWI1NWI3MzgyNWJmYWVmY2I1ZGI2MDU4ZmFlNWM3ZWVjOA==
 SHA512:
   metadata.gz: !binary |-
-    Y2NlYmU0MDc0ZTQ0NWI4NTU2YjVlYzYzYzkwZWYyM2ZkMGQ0NTY3NmZkZTY2
-    MDdlZjgzZDg3NWM0YWZlZDVkOGM0YWU2YWI1YTc2MTYxZGIyZTNkY2MyNzhh
-    NjM5MDEzOWEzNWEwODAzMDJhZjIzYTdkY2M3NTZjMTc5Y2IwOGI=
+    OWEwYTA2MGEyYmI1YmMyMjAxZWMzYzljZjg2NDRhYTJmNWYwNTgyNGNlZTUw
+    ZDg0M2I2YWI5MjQxYjQxMjNkZmRjYjJhODgxYTQ4N2FmM2U5YWE2ODgyNTQ5
+    N2EyN2JjYjdmZDdiNzAzYzcyMzg4NjRlNmZkYzYzMTQ3NTg1YjU=
   data.tar.gz: !binary |-
-    MTc5ODRjYWUzM2Y5NjJmOGY0NDRhYjZmNDRkYzA4ODg2OGYzN2M3MmI1N2Zh
-    ZmM3MGNhNmE0ZmVmYjE1ZjM4MTc2ZWRmOGQ0Y2RmODBkYTYwMjcwNDc2ZGU5
-    NDI2ZDlhYWIyZTg5OTRiNWZhY2VjYThhNTljZjdjZDBjMTdkNGY=
+    YTZkMjI0MTAwYzBjNzZkZmI0ZWY5N2FlMjk1OGZiMmQ4MWNlNDY0YmJkYjQ3
+    OGY4NWYwMDZkNTUxNTYyYzY5ZmIxNjJlNDIyNzRlODE0NmViMTNmYzZjMjAw
+    ZWRkYjFhN2U1YmVhZTA3YmYzOTFiYjkyZmU3NzAyODhiMmIxODU=

data/lib/social_snippet.rb

@@ -10,6 +10,7 @@ require "optparse"
 require "uri"
 require "wisper"
 require "securerandom"
+require "css_parser"
 
 module SocialSnippet; end
 require_relative "social_snippet/core"

data/lib/social_snippet/config.rb

@@ -88,6 +88,10 @@ class SocialSnippet::Config
   # config helpers
   #
 
+  def snippet_css
+    ::File.join home, "snippet.css"
+  end
+
   def document_path
     ::File.join home, "documents.yml"
   end

data/lib/social_snippet/resolvers/insert_resolver.rb

@@ -16,10 +16,51 @@ module SocialSnippet
     end
 
     def init_options
-      options[:margin_bottom] = options.fetch(:margin_bottom, 0)
+      # apply local snippet.css
+      parse_snippet_css "snippet.css"
+
+      # apply global snippet.css
+      parse_snippet_css core.config.snippet_css
+
+      # use default value
+      options[:margin_bottom] = options.fetch(:margin_bottom, 1)
       options[:margin_top] = options.fetch(:margin_top, 0)
     end
 
+    def convert_to_option_key(prop)
+      case prop
+      when "margin-bottom"
+        :margin_bottom
+      when "margin-top"
+        :margin_top
+      else
+        prop.to_sym
+      end
+    end
+
+    # Example of snippet.css
+    # ```css
+    # snippet {
+    #   margin-top: 3;
+    #   margin-bottom: 3;
+    # }
+    # ```
+    def parse_snippet_css(path)
+      return unless core.storage.file?(path)
+      parser = ::CssParser::Parser.new
+      parser.add_block! core.storage.read(path)
+      apply_styles parser, "snippet"
+    end
+
+    def apply_styles(parser, selector)
+      style = parser.find_by_selector(selector).first
+      rules = ::CssParser::RuleSet.new(nil, style)
+      rules.each_declaration do |prop, val, imp|
+        key = convert_to_option_key(prop)
+        options[key] = options.fetch(key, val.to_i)
+      end
+    end
+
     # Insert snippets to given text
     #
     # @param text [String] The text of source code

data/lib/social_snippet/version.rb

@@ -1,6 +1,6 @@
 module SocialSnippet
 
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 
   module Version
 

data/social_snippet.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline", "~> 1.7.0"
   spec.add_runtime_dependency "wisper", "~> 1.6.0"
   spec.add_runtime_dependency "social_snippet-supports-git", "~> 0.1.0"
+  spec.add_runtime_dependency "css_parser", "~> 1.3.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/lib/api/insert_snippet_spec.rb

@@ -4,6 +4,16 @@ module SocialSnippet
 
   describe Api::InsertSnippetApi do
 
+    before do
+      # prepare snippet.css (global)
+      fake_core.storage.write fake_core.config.snippet_css, [
+        "snippet {",
+        "  margin-top: 0;",
+        "  margin-bottom: 0;",
+        "}",
+      ].join($/)
+    end
+
     describe "#insert_snippet()", :without_fakefs => true do
 
       class FakeDriver < ::SocialSnippet::Repository::Drivers::DriverBase

data/spec/lib/core_spec.rb

@@ -88,6 +88,7 @@ module SocialSnippet
               '  return 42;',
               '}',
               '',
+              '',
               'int main() {',
               '  std::cout << get_42() << std::endl;',
               '  return 0;',

data/spec/lib/insert_resolver_spec.rb

@@ -26,6 +26,16 @@ describe SocialSnippet::Resolvers::InsertResolver do
       end
     end
 
+    before do
+      # prepare snippet.css (global)
+      fake_core.storage.write fake_core.config.snippet_css, [
+        "snippet {",
+        "  margin-top: 0;",
+        "  margin-bottom: 0;",
+        "}",
+      ].join($/)
+    end
+
     describe "@begin_cut / @end_cut" do
 
       describe "ruby's require()" do
@@ -191,6 +201,248 @@ describe SocialSnippet::Resolvers::InsertResolver do
 
       end # :margin_bottom
 
+      describe "snippet.css", :current => true do
+
+        context "snippet { margin-bottom: 3 }" do
+
+          before do
+            fake_core.storage.write "snippet.css", [
+              "snippet { margin-bottom: 3; }"
+            ].join($/)
+          end
+
+          let(:resolver) do
+            ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, ::Hash.new)
+          end
+
+          let(:input) do
+            [
+              "// @snip <my-repo-1:path/to/file.d>",
+              "// @snip <my-repo-2:path/to/file.d>",
+              "// @snip <my-repo-3:path/to/file.d>",
+            ].join($/)
+          end
+
+          let(:expected) do
+            [
+              "// @snippet <my-repo-1:path/to/file.d>",
+              "my-repo-1",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-2:path/to/file.d>",
+              "my-repo-2",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-3:path/to/file.d>",
+              "my-repo-3",
+              "",
+              "",
+              "",
+            ].join($/)
+          end
+
+          subject { resolver.insert input }
+          it { should eq expected }
+
+        end # snippet { margin-bottom: 3 }
+
+        context "snippet { margin-top: 3; margin-bottom: 3 }" do
+
+          before do
+            fake_core.storage.write "snippet.css", [
+              "snippet {",
+              "  margin-top: 3;",
+              "  margin-bottom: 3;",
+              "}",
+            ].join($/)
+          end
+
+          let(:resolver) do
+            ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, ::Hash.new)
+          end
+
+          let(:input) do
+            [
+              "// @snip <my-repo-1:path/to/file.d>",
+              "// @snip <my-repo-2:path/to/file.d>",
+              "// @snip <my-repo-3:path/to/file.d>",
+            ].join($/)
+          end
+
+          let(:expected) do
+            [
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-1:path/to/file.d>",
+              "my-repo-1",
+              "",
+              "",
+              "",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-2:path/to/file.d>",
+              "my-repo-2",
+              "",
+              "",
+              "",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-3:path/to/file.d>",
+              "my-repo-3",
+              "",
+              "",
+              "",
+            ].join($/)
+          end
+
+          subject { resolver.insert input }
+          it { should eq expected }
+
+        end # snippet { margin-top: 3; margin-bottom: 3 }
+
+        context "global - snippet { margin-bottom: 3 }" do
+
+          before do
+            fake_core.storage.write fake_core.config.snippet_css, [
+              "snippet{ margin-top: 3; margin-bottom: 0 }"
+            ].join($/)
+          end
+
+          let(:resolver) do
+            ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, ::Hash.new)
+          end
+
+          let(:input) do
+            [
+              "// @snip <my-repo-1:path/to/file.d>",
+              "// @snip <my-repo-2:path/to/file.d>",
+              "// @snip <my-repo-3:path/to/file.d>",
+            ].join($/)
+          end
+
+          let(:expected) do
+            [
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-1:path/to/file.d>",
+              "my-repo-1",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-2:path/to/file.d>",
+              "my-repo-2",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-3:path/to/file.d>",
+              "my-repo-3",
+            ].join($/)
+          end
+
+          subject { resolver.insert input }
+          it { should eq expected }
+
+        end
+
+        context "local css > global css" do
+
+          before do
+            fake_core.storage.write fake_core.config.snippet_css, [
+              "snippet{ margin-top: 0; margin-bottom: 0 }"
+            ].join($/)
+
+            fake_core.storage.write "snippet.css", [
+              "snippet{ margin-top: 3; margin-bottom: 0 }"
+            ].join($/)
+          end
+
+          let(:resolver) do
+            ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, ::Hash.new)
+          end
+
+          let(:input) do
+            [
+              "// @snip <my-repo-1:path/to/file.d>",
+              "// @snip <my-repo-2:path/to/file.d>",
+              "// @snip <my-repo-3:path/to/file.d>",
+            ].join($/)
+          end
+
+          let(:expected) do
+            [
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-1:path/to/file.d>",
+              "my-repo-1",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-2:path/to/file.d>",
+              "my-repo-2",
+              "",
+              "",
+              "",
+              "// @snippet <my-repo-3:path/to/file.d>",
+              "my-repo-3",
+            ].join($/)
+          end
+
+          subject { resolver.insert input }
+          it { should eq expected }
+
+        end # local css > global css
+
+        context "multi-selector case" do
+
+          before do
+            fake_core.storage.write fake_core.config.snippet_css, [
+              "abcde, snippet, .test, #testtest { margin-top: 2; margin-bottom: 0 }"
+            ].join($/)
+          end
+
+          let(:resolver) do
+            ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, ::Hash.new)
+          end
+
+          let(:input) do
+            [
+              "// @snip <my-repo-1:path/to/file.d>",
+              "// @snip <my-repo-2:path/to/file.d>",
+              "// @snip <my-repo-3:path/to/file.d>",
+            ].join($/)
+          end
+
+          let(:expected) do
+            [
+              "",
+              "",
+              "// @snippet <my-repo-1:path/to/file.d>",
+              "my-repo-1",
+              "",
+              "",
+              "// @snippet <my-repo-2:path/to/file.d>",
+              "my-repo-2",
+              "",
+              "",
+              "// @snippet <my-repo-3:path/to/file.d>",
+              "my-repo-3",
+            ].join($/)
+          end
+
+          subject { resolver.insert input }
+          it { should eq expected }
+
+        end # multi-selectors case
+
+      end # snippet.css
+
     end # test styling
 
   end # prepare stubs

data/spec/lib/snippet_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe ::SocialSnippet::Snippet, :current => true do
+
+  describe "snippet.css" do
+
+    context "prepare snippet" do
+
+      let(:snippet) do
+        ::SocialSnippet::Snippet.new_text fake_core, [
+          "line-1",
+          "line-2",
+          "line-3",
+        ].join($/)
+      end
+
+      context "no styles" do
+        subject { snippet.lines }
+        let(:expected) do
+          [
+            "line-1",
+            "line-2",
+            "line-3",
+          ]
+        end
+        it { should eq expected }
+      end
+
+    end # prepare snippet
+
+  end # snippet.css
+
+end # ::SocialSnippet::Snippet
+

data/test/insert_snippet_test.rb

@@ -50,6 +50,16 @@ describe SocialSnippet::Api::InsertSnippetApi do
     end
   end
 
+  before do
+    # prepare snippet.css (global)
+    fake_core.storage.write fake_core.config.snippet_css, [
+      "snippet {",
+      "  margin-top: 0;",
+      "  margin-bottom: 0;",
+      "}",
+    ].join($/)
+  end
+
   describe "#insert_snippet" do
 
     context "use commit id" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_snippet
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Hiroyuki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version_sorter
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: css_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,7 @@ files:
 - spec/lib/repository/package_spec.rb
 - spec/lib/repository/repository_manager_spec.rb
 - spec/lib/repository/repository_spec.rb
+- spec/lib/snippet_spec.rb
 - spec/lib/tag_parser_spec.rb
 - spec/lib/tag_spec.rb
 - spec/lib/yaml_document_spec.rb
@@ -385,6 +400,7 @@ test_files:
 - spec/lib/repository/package_spec.rb
 - spec/lib/repository/repository_manager_spec.rb
 - spec/lib/repository/repository_spec.rb
+- spec/lib/snippet_spec.rb
 - spec/lib/tag_parser_spec.rb
 - spec/lib/tag_spec.rb
 - spec/lib/yaml_document_spec.rb