social_snippet 0.0.7 → 0.0.8

data/lib/social_snippet/context.rb

@@ -1,7 +1,10 @@
 class SocialSnippet::Context
 
+  require "pathname"
+
   attr_reader :flag_absolute
   attr_reader :path
+  attr_reader :pathname
   attr_reader :repo
   attr_reader :ref
 
@@ -9,12 +12,18 @@ class SocialSnippet::Context
   #
   # @param new_path [String] The path of context
   def initialize(new_path, new_repo = nil, new_ref = nil)
-    @flag_absolute = is_absolute_path(new_path)
-    @path = new_path
+    set_path new_path
     @repo = new_repo
     @ref  = new_ref
   end
 
+  def set_path(new_path)
+    return if new_path.nil?
+    @path = new_path
+    @pathname = ::Pathname.new(path)
+    @flag_absolute = is_absolute_path(path)
+  end
+
   # Check context in repo
   #
   # @return [Boolean]
@@ -31,25 +40,36 @@ class SocialSnippet::Context
     if new_repo.nil?
       if is_absolute_path(new_path)
         @flag_absolute = true
-        @path = new_path
+        set_path new_path
       else
-        @path = move_func(new_path)
+        set_path move_path(new_path)
       end
     else
       @flag_absolute = false
-      @path = new_path
+      set_path new_path
       @repo = new_repo
       @ref  = new_ref
     end
   end
 
+  def basename
+    pathname.basename.to_s unless path.nil?
+  end
+
+  def dirname
+    pathname.dirname.to_s unless path.nil?
+  end
+
+  def root_text?
+    path.nil?
+  end
+
   private
 
-  def move_func(new_path)
-    source = path.split("/")
-    source_file = source.pop
+  def move_path(new_path)
+    source = dirname.split("/")
     dest = new_path.split("/")
-    dest_file = dest.pop
+    destname = dest.pop
 
     if is_absolute_path(path)
       source.shift
@@ -64,13 +84,14 @@ class SocialSnippet::Context
     end
 
     if flag_absolute
-      "/" + source.join("/") + "/" + dest_file
+      "/" + source.join("/") + "/" + destname
     else
-      source.join("/") + "/" + dest_file
+      source.join("/") + "/" + destname
     end
   end
 
   private
+
   # Check given text is absolute path
   def is_absolute_path(s)
     s[0] === "/"

data/lib/social_snippet/registry/registry_client.rb

@@ -2,12 +2,12 @@ module SocialSnippet::Registry
 
   class RegistryClient
 
-    attr_reader :social_snippet
+    attr_reader :core
     attr_reader :repositories
 
-    def initialize(new_social_snippet)
-      @social_snippet = new_social_snippet
-      @repositories = RegistryResources::Repositories.new(social_snippet)
+    def initialize(new_core)
+      @core = new_core
+      @repositories = RegistryResources::Repositories.new(core)
     end
 
   end

data/lib/social_snippet/registry/registry_resources/base.rb

@@ -5,27 +5,27 @@ module SocialSnippet::Registry::RegistryResources
 
   class Base
 
-    attr_reader :social_snippet
+    attr_reader :core
     attr_reader :rest_client
     attr_reader :end_point
     attr_reader :cookies
     attr_reader :default_headers
 
-    def initialize(new_social_snippet)
-      @social_snippet = new_social_snippet
-      @end_point      = social_snippet.config.sspm_url
+    def initialize(new_core)
+      @core = new_core
+      @end_point      = core.config.sspm_url
       @rest_client    = ::RestClient::Resource.new(end_point)
       @cookies        = {}
       @default_headers = {
         :accept => :json,
       }
 
-      social_snippet.logger.debug "registry: end-point = #{end_point}"
+      core.logger.debug "registry: end-point = #{end_point}"
     end
 
     def post(req_path, params, headers = {})
-      social_snippet.logger.debug "registry: post: #{req_path}"
-      social_snippet.logger.debug params
+      core.logger.debug "registry: post: #{req_path}"
+      core.logger.debug params
       csrf_token = fetch_csrf_token
 
       # set headers
@@ -34,18 +34,18 @@ module SocialSnippet::Registry::RegistryResources
       headers["X-CSRF-Token"] = csrf_token
 
       # debug output
-      social_snippet.logger.debug "registry: post: csrf_token = #{csrf_token}"
-      social_snippet.logger.debug "registry: post: headers:"
-      social_snippet.logger.debug headers
+      core.logger.debug "registry: post: csrf_token = #{csrf_token}"
+      core.logger.debug "registry: post: headers:"
+      core.logger.debug headers
 
       parse_response rest_client[req_path].post(params.to_json, headers)
     end
 
     def get(req_path, headers = {})
-      social_snippet.logger.debug "registry: get #{req_path}"
+      core.logger.debug "registry: get #{req_path}"
       headers.merge! default_headers
-      social_snippet.logger.debug "registry: headers:"
-      social_snippet.logger.debug headers
+      core.logger.debug "registry: headers:"
+      core.logger.debug headers
       parse_response rest_client[req_path].get(headers)
     end
 

data/lib/social_snippet/repository/repository_installer.rb

@@ -4,20 +4,20 @@ module SocialSnippet::Repository
 
   class RepositoryInstaller
 
-    attr_reader :social_snippet
+    attr_reader :core
     attr_reader :data
 
-    def initialize(new_social_snippet)
-      @social_snippet = new_social_snippet
+    def initialize(new_core)
+      @core = new_core
       init_data
     end
 
     def path
-      social_snippet.config.install_path
+      core.config.install_path
     end
 
     def data_file
-      social_snippet.config.installed_repos_file
+      core.config.installed_repos_file
     end
 
     def init_data
@@ -61,7 +61,7 @@ module SocialSnippet::Repository
     end
 
     def copy_repository(repo, options = {})
-      social_snippet.logger.debug "repository_installer: repo.path = #{repo.path}"
+      core.logger.debug "repository_installer: repo.path = #{repo.path}"
       ::FileUtils.cp_r repo.path, repo_path(repo.name)
     end
 

data/lib/social_snippet/repository/repository_manager.rb

@@ -5,15 +5,15 @@ module SocialSnippet::Repository
     attr_reader :installer
     attr_reader :repo_paths
     attr_reader :repo_cache_path
-    attr_reader :social_snippet
+    attr_reader :core
 
     # Constructor
     #
-    # @param new_social_snippet [::SocialSnippet::Core]
-    def initialize(new_social_snippet)
-      @social_snippet = new_social_snippet
-      @installer = ::SocialSnippet::Repository::RepositoryInstaller.new(social_snippet)
-      @repo_cache_path = social_snippet.config.repository_cache_path
+    # @param new_core [::SocialSnippet::Core]
+    def initialize(new_core)
+      @core = new_core
+      @installer = ::SocialSnippet::Repository::RepositoryInstaller.new(core)
+      @repo_cache_path = core.config.repository_cache_path
       @repo_paths = []
 
       init_repo_paths
@@ -47,19 +47,18 @@ module SocialSnippet::Repository
       ::SocialSnippet::Snippet.new(resolve_snippet_path(context, tag))
     end
 
-    # Resolve snippet path from tag
+    # Resolve snippet path by context and tag
     #
     # @param context [::SocialSnippet::Context] The context of snippet
     # @param tag [::SocialSnippet::Tag] The tag of snippet
     def resolve_snippet_path(context, tag)
       if tag.has_repo?
         repo = find_repository_by_tag(tag)
-        return repo.real_path tag.path
+        repo.real_path tag.path
+      else
+        new_context = context.clone
+        new_context.dirname + "/" + tag.filename
       end
-
-      new_context = context.clone
-      new_context.move tag.path
-      return new_context.path
     end
 
     # Find repository by tag

data/lib/social_snippet/resolvers/base_resolver.rb

@@ -2,14 +2,14 @@ module SocialSnippet
 
   class Resolvers::BaseResolver
 
-    attr_reader :social_snippet
+    attr_reader :core
     attr_reader :visited
 
     # Constructor
     #
-    # @param new_social_snippet [::SocialSnippet::Core]
-    def initialize(new_social_snippet)
-      @social_snippet = new_social_snippet
+    # @param new_core [::SocialSnippet::Core]
+    def initialize(new_core)
+      @core = new_core
       @visited = Set.new
     end
 
@@ -25,21 +25,35 @@ module SocialSnippet
         t = tag_info[:tag].set_by_tag(base_tag)
         new_context = context.clone
 
-        move_context_by_tag! new_context, t
-        overwrite_tag_in_same_repository! context, t
-        update_tag_path_by_context! new_context, t
-        resolve_tag_repo_ref! t
+        if new_context.root_text?
+          new_context.set_path ""
+          move_context_by_tag! new_context, t
+        else
+          move_context_by_tag! new_context, t
+          overwrite_tag_in_same_repository! new_context, t
+          update_tag_path_by_context! new_context, t
+          resolve_tag_repo_ref! t
+        end
 
-        child_snippet = social_snippet.repo_manager.get_snippet(context, t)
+        resolve_tag_repo_ref! t
+        child_snippet = core.repo_manager.get_snippet(new_context, t)
+        t.set_path new_context.path
 
         if block_given?
-          yield tag_info[:tag], tag_info[:line_no], child_snippet, new_context
+          yield t, tag_info[:line_no], child_snippet, new_context
         end
       end
     end
 
     private
 
+    def resolve_tag_repo_ref!(t)
+      if t.has_repo?
+        repo = core.repo_manager.find_repository_by_tag(t)
+        t.set_ref repo.latest_version(t.ref)
+      end
+    end
+
     def move_context_by_tag!(context, tag)
       if tag.has_repo?
         if tag.has_ref?
@@ -69,7 +83,7 @@ module SocialSnippet
 
     # Resolve tag's ref
     def resolve_tag_repo_ref!(tag)
-      repo = social_snippet.repo_manager.find_repository_by_tag(tag)
+      repo = core.repo_manager.find_repository_by_tag(tag)
 
       # not found
       return if repo.nil?

data/lib/social_snippet/resolvers/dep_resolver.rb

@@ -6,10 +6,10 @@ module SocialSnippet
 
     # Constructor
     #
-    # @param social_snippet [::SocialSnippet::Core]
-    def initialize(social_snippet)
+    # @param core [::SocialSnippet::Core]
+    def initialize(core)
       @dep_to = {} # dep_to[tag_from] = tag_to
-      super(social_snippet)
+      super(core)
     end
 
     # Find all missing depended snippets
@@ -20,7 +20,7 @@ module SocialSnippet
     def find(snippet, context_from, tag_from)
       raise "must be passed snippet" unless snippet.is_a?(Snippet)
 
-      found_tags = find_func snippet, context_from, tag_from
+      found_tags = find_func(snippet, context_from, tag_from)
       found_tags.each do |tag_info|
         # remove self from deps graph
         tag = tag_info[:tag]

data/lib/social_snippet/resolvers/insert_resolver.rb

@@ -7,11 +7,11 @@ module SocialSnippet
 
     # Constructor
     #
-    # @param social_snippet [::SocialSnippet::Core]
-    def initialize(social_snippet, new_options = {})
+    # @param core [::SocialSnippet::Core]
+    def initialize(core, new_options = {})
       @options = new_options
-      @deps_resolver = Resolvers::DepResolver.new(social_snippet)
-      super(social_snippet)
+      @deps_resolver = Resolvers::DepResolver.new(core)
+      super(core)
       init_options
     end
 
@@ -26,15 +26,13 @@ module SocialSnippet
     def insert(text)
       raise "must be passed string" unless text.is_a?(String)
 
-      context = Context.new("")
       snippet = Snippet.new_text(text)
-
       snippet.snippet_tags.each do |tag_info|
         visit tag_info[:tag]
       end
 
-      dest = insert_func(snippet, context)
-      return dest.join($/)
+      context = Context.new(nil)
+      insert_func(snippet, context).join($/)
     end
 
     private
@@ -68,7 +66,9 @@ module SocialSnippet
       src = insert_func(snippet, context, tag)
 
       options[:margin_top].times { inserter.insert "" }
-      inserter.insert tag.to_snippet_tag # @snip -> @snippet
+      # @snip -> @snippet
+      inserter.insert tag.to_snippet_tag unless snippet.no_tag?
+      # insert snippet text
       inserter.insert src
       options[:margin_bottom].times { inserter.insert "" }
 
@@ -85,11 +85,12 @@ module SocialSnippet
       dep_tags.each do |tag_info|
         sub_t = tag_info[:tag]
         sub_c = tag_info[:context]
+        resolve_tag_repo_ref! sub_t
 
-        visit(tag) if is_self(tag, context)
+        visit(tag) if is_self(sub_t, sub_c)
         next if is_visited(sub_t)
 
-        next_snippet = social_snippet.repo_manager.get_snippet(sub_c, sub_t)
+        next_snippet = core.repo_manager.get_snippet(sub_c, sub_t)
         insert_by_tag_and_context! inserter, next_snippet, sub_c, sub_t
       end
     end
@@ -109,10 +110,10 @@ module SocialSnippet
       dep_tags.each do |tag_info|
         tag = tag_info[:tag].to_path
         dep_ind = dep_tags_index[tag]
-        dep_tags_hash[dep_ind] = deps_resolver.dep_to[tag].to_a.map {|tag| dep_tags_index[tag] }
+        dep_tags_hash[dep_ind] = deps_resolver.dep_to[tag].to_a.map {|tag| dep_tags_index[tag] }.reject(&:nil?)
       end
 
-      dep_tags_hash.tsort.map {|k| dep_tags[k]}
+      dep_tags_hash.tsort.map {|k| dep_tags[k] }
     end
 
   end # BaseResolver

data/lib/social_snippet/snippet.rb

@@ -1,75 +1,96 @@
-class SocialSnippet::Snippet
+module SocialSnippet
 
-  attr_reader :filepath
-  attr_reader :code
+  class Snippet
 
-  # Constructor
-  def initialize(snippet_path)
-    @filepath = snippet_path
-    read_file unless filepath.nil?
-  end
+    attr_reader :filepath
+    attr_reader :code
+    attr_reader :flag_no_tag
 
-  def read_file
-    @code = ::File.read(filepath).split($/)
-  end
+    # Constructor
+    def initialize(snippet_path)
+      @filepath = snippet_path
+      read_file unless filepath.nil?
+    end
 
-  def read_text(s)
-    raise "must be passed string" unless s.is_a?(String)
-    @code = s.split($/)
-  end
+    def read_file
+      @code = ::File.read(filepath).split($/)
+    end
 
-  def lines
-    @lines ||= new_lines
-  end
+    def read_text(s)
+      raise "must be passed string" unless s.is_a?(String)
+      @code = s.split($/)
+    end
 
-  def snippet_tags
-    ::SocialSnippet::TagParser.find_snippet_tags lines
-  end
+    def lines
+      @lines ||= new_lines
+    end
 
-  def snip_tags
-    ::SocialSnippet::TagParser.find_snip_tags lines
-  end
+    def snippet_tags
+      TagParser.find_snippet_tags lines
+    end
 
-  class << self
+    def snip_tags
+      TagParser.find_snip_tags lines
+    end
 
-    # Create instance by text
-    def new_text(s)
-      raise "must be passed string" unless s.is_a?(String)
-      snippet = self.new(nil)
-      snippet.read_text s
-      snippet
+    def no_tag?
+      flag_no_tag
     end
 
-  end
+    class << self
 
-  private
+      # Create instance by text
+      def new_text(s)
+        raise "must be passed string" unless s.is_a?(String)
+        snippet = self.new(nil)
+        snippet.read_text s
+        snippet
+      end
 
-  # Return filtered and styled lines
-  def new_lines
-    tmp = code.clone
-    tmp = filter(tmp)
-    tmp
-  end
+    end
 
-  # @param lines [Array<String>]
-  def filter(lines)
-    lines = cut_filter(lines)
-    lines
-  end
+    private
+
+    # Return filtered and styled lines
+    def new_lines
+      tmp = code.clone
+      tmp = filter(tmp)
+      tmp
+    end
+
+    # @param lines [Array<String>]
+    def filter(lines)
+      lines = filter_range_cut(lines)
+      lines = filter_line_cut(lines)
+      lines = resolve_control_tags(lines)
+      lines
+    end
+
+    def resolve_control_tags(lines)
+      @flag_no_tag = (false === TagParser.find_no_tags(lines).empty?)
+      lines.reject {|s| Tag.is_control_tag? s }
+    end
 
-  def cut_filter(lines)
-    cut_level = 0
-    lines.select do |line|
-      if ::SocialSnippet::Tag.is_begin_cut?(line)
-        cut_level += 1
-        false
-      elsif ::SocialSnippet::Tag.is_end_cut?(line)
-        cut_level -= 1
-        false
-      else
-        cut_level === 0
+    def filter_line_cut(lines)
+      lines.select {|s| not Tag.is_cut? s }
+    end
+
+    def filter_range_cut(lines)
+      cut_level = 0
+      lines.select do |line|
+        if Tag.is_begin_cut?(line)
+          cut_level += 1
+          false
+        elsif Tag.is_end_cut?(line)
+          cut_level -= 1
+          false
+        else
+          cut_level === 0
+        end
       end
     end
+
   end
 
 end
+